Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

02-10 merge #102

Merged
merged 46 commits into from
Oct 2, 2023
Merged

02-10 merge #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
6b6c8b3
TTS voice muffling on the half mask respirator can be toggled on or o…
Paxilmaniac Sep 29, 2023
4e2bee5
Holster upgrade, badassery for everyone [MDB IGNORE] (#24025)
SkyratBot Sep 29, 2023
f7978d7
Adds some new hairstyles (#24005)
Smol42 Sep 29, 2023
e2556ff
Feature: bitrunner, a new supply role (READY) [MDB IGNORE] (#23865)
SkyratBot Sep 30, 2023
8145bcb
fixes the tendril blessing (respawning) (#24028)
jjpark-kb Sep 30, 2023
da48ea3
Moves gauze removal signals to gauze destroy, removing weird seep_gau…
nikothedude Sep 30, 2023
9676b36
crowd control - puts teargas/flashbangs in the voidraptor armory (#23…
Hatterhat Sep 30, 2023
5eda0cd
Fixes missing grinder in Birdshot's Virology department [MDB IGNORE] …
SkyratBot Sep 30, 2023
b6a8be5
Bitrunning "Clown Planet" Mission Fix [MDB IGNORE] (#24012)
SkyratBot Sep 30, 2023
f7aee04
Basic blob mobs [MDB IGNORE] (#23938)
SkyratBot Sep 30, 2023
9272e8b
bitrunning hotfix 2 [NO GBP] [MDB IGNORE] (#24011)
SkyratBot Sep 30, 2023
7d99dec
Restores player blob mob attack speeds [MDB IGNORE] (#24001)
SkyratBot Sep 30, 2023
76a6db7
Increases codeside roundstart Cyborg slots to 3. [MDB IGNORE] (#24026)
SkyratBot Sep 30, 2023
5173615
Fix roundstart crewmembers not getting their radio hint message / Exa…
SkyratBot Sep 30, 2023
97dca82
Removes all spawn locations of the awakened plush except the bus ruin…
SkyratBot Sep 30, 2023
8d86116
Fixes runtime when baking foods that don't have reagents. [MDB IGNORE…
SkyratBot Sep 30, 2023
36207fc
No Nunsense [MDB IGNORE] (#24045)
SkyratBot Sep 30, 2023
2d29c89
Updates the buttondown shirt underwear sprites I added (#23742)
Paxilmaniac Sep 30, 2023
fd374a4
simplifying fishing line shitcode. [MDB IGNORE] (#24046)
SkyratBot Sep 30, 2023
b83d626
TGUI panel font setting overrides applies to all text [MDB IGNORE] (#…
SkyratBot Sep 30, 2023
7e1bd72
Refactors Supermatter Spiders into Basic Mobs [MDB IGNORE] (#24044)
SkyratBot Sep 30, 2023
8a904cb
Adds warden to default required enemies for dynamic rulesets [MDB IGN…
SkyratBot Sep 30, 2023
e89f4ec
ArCargo: Adds the Galactic Materials Stock Market V1.2 (Free Market E…
SkyratBot Sep 30, 2023
6e5978c
Heretic Rebalance - Main Knowledge gives free Side points, reduced ru…
SkyratBot Sep 30, 2023
6954d08
return to tradition - brings .50 back in line with tg balance (#23626)
Hatterhat Sep 30, 2023
f0f229d
reduces base wound bonus of bullets' base type (#23574)
Hatterhat Sep 30, 2023
e71b3e4
Security Officers can now Download the Plexagon Crew Manifest PDA App…
SkyratBot Oct 1, 2023
0dff6ef
Resleeving part one: RSD brain interface (#23525)
softcerv Oct 1, 2023
4fd35ea
NIFSoft Scryer (#23482)
softcerv Oct 1, 2023
9d1864f
Attachable Soulcatchers (#23581)
softcerv Oct 1, 2023
7003243
Adds user feedback for going over order limits in cargo console (#763…
vinylspiders Oct 1, 2023
eac767f
Gives sci departmental order consoles access to canstiers & materials…
SkyratBot Oct 1, 2023
2f0e437
The fishing portal generator expansion (plus skill-chip) [MDB IGNORE]…
SkyratBot Oct 1, 2023
a6653c3
Grand Ritual Finale: An end to death [MDB IGNORE] (#24053)
SkyratBot Oct 1, 2023
1a13cad
Revert font scaling in TGUI chat back to its prior implementation [MD…
SkyratBot Oct 1, 2023
19c1d75
X-01 nerf revert (#24054)
projectkepler-ru Oct 2, 2023
3eabe8e
(MODULAR) Hypnosis NIFSoft (#24048)
softcerv Oct 2, 2023
00901c7
Fixes some runtimes with the pollution system (#24029)
vinylspiders Oct 2, 2023
10e0b4b
Removes duplicate icons from belt.dmi [MDB IGNORE] (#24061)
SkyratBot Oct 2, 2023
f864eaf
Pulls over some changes I made on wallening [MDB IGNORE] (#24062)
SkyratBot Oct 2, 2023
0b6262d
Fixes Listening Post Door [MDB IGNORE] (#24063)
SkyratBot Oct 2, 2023
8a2e9be
Reduces click cooldown of more primarily player-controlled mobs [MDB …
SkyratBot Oct 2, 2023
3c20e06
adds boxes of bandages, and bandages to go in them [MDB IGNORE] (#24065)
SkyratBot Oct 2, 2023
9a8258f
Tweaks railings to stand and look taller [MDB IGNORE] (#24070)
SkyratBot Oct 2, 2023
42b344c
manual changelogs
Iajret Oct 2, 2023
42841a1
bitrunners to journey and kilo
Iajret Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 4 additions & 5 deletions _maps/RandomRuins/SpaceRuins/listeningstation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@
anchored = 1
},
/obj/machinery/door/window/brigdoor{
dir = 2;
req_access = list("syndicate");
name = "Self Destruct Option"
},
Expand Down Expand Up @@ -305,9 +304,6 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/listeningstation)
"rr" = (
/obj/machinery/door/airlock{
name = "Emergency Backup"
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -392,7 +388,6 @@
/area/ruin/space/has_grav/listeningstation)
"xh" = (
/obj/machinery/computer/records/medical/syndie{
dir = 2;
req_access = list("syndicate")
},
/obj/machinery/light/small/directional/north,
Expand Down Expand Up @@ -813,6 +808,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/mapping_helpers/broken_floor,
/obj/machinery/door/airlock{
name = "Emergency Backup"
},
/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
/turf/open/floor/plating,
/area/ruin/space/has_grav/listeningstation)
"RK" = (
Expand Down
19 changes: 7 additions & 12 deletions _maps/RandomRuins/SpaceRuins/skyrat/wreckedhomestead.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/iron/airless,
/area/ruin/unpowered)
"oa" = (
/obj/machinery/rnd/bepis,
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/iron/airless,
/area/ruin/unpowered)
"on" = (
/obj/structure/closet/secure_closet/brig,
/obj/structure/window/reinforced/spawner/directional/west,
Expand Down Expand Up @@ -133,6 +128,11 @@
/obj/machinery/door/firedoor,
/turf/open/floor/iron/dark/airless,
/area/ruin/unpowered)
"tP" = (
/obj/machinery/cryo_cell,
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating/airless,
/area/ruin/unpowered)
"ve" = (
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
dir = 1
Expand Down Expand Up @@ -160,11 +160,6 @@
},
/turf/open/floor/plating/airless,
/area/ruin/unpowered)
"Az" = (
/obj/machinery/cryo_cell,
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating/airless,
/area/ruin/unpowered)
"Bf" = (
/turf/closed/wall/mineral/titanium,
/area/ruin/unpowered)
Expand Down Expand Up @@ -1209,7 +1204,7 @@ wY
Bf
Wp
Bf
Az
tP
Dh
ve
mP
Expand Down Expand Up @@ -1276,7 +1271,7 @@ Wv
kN
dL
Bf
oa
kN
Bf
Bf
Bf
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomZLevels/blackmesa.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5008,7 +5008,7 @@
/turf/open/floor/iron/smooth_large,
/area/awaymission/black_mesa/entrance_internal_hall)
"cPC" = (
/mob/living/simple_animal/hostile/blob/blobspore/independent,
/mob/living/basic/blob_minion/spore,
/obj/structure/blob/normal,
/turf/open/floor/engine,
/area/awaymission/black_mesa/hecu_zone_test_chambers)
Expand Down Expand Up @@ -9388,7 +9388,7 @@
/turf/open/floor/iron/white,
/area/awaymission/black_mesa/hecu_zone_camp)
"ldC" = (
/mob/living/simple_animal/hostile/blob/blobbernaut/independent,
/mob/living/basic/blob_minion/blobbernaut,
/obj/structure/blob/normal,
/turf/open/floor/engine,
/area/awaymission/black_mesa/hecu_zone_test_chambers)
Expand Down
Loading
Loading