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

Merge Upstream 07.01.2024 #894

Merged
merged 41 commits into from
Jan 7, 2024
Merged

Merge Upstream 07.01.2024 #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
2140320
Reworks the effects of brain damage (#23343)
BiancaWilkson Jan 6, 2024
860eee7
Removes Steal AI as an Objective (#23402)
OctusGit Jan 6, 2024
c44231e
Adds the Technocracy Advanced Cloning System Kit (#23420)
Qwertytoforty Jan 6, 2024
5627b5b
Fix duplicate tracking beacon issue (#23508)
PIerreLouisH Jan 6, 2024
1267ad9
Antag contractees no longer have an increased timer, contractees now …
BiancaWilkson Jan 6, 2024
c1a37d4
PDA ringtone input is now trimmed (#23579)
Contrabang Jan 6, 2024
a432beb
Fix Reactive Repulse Armor no longer yetting spectators (#23580)
PIerreLouisH Jan 6, 2024
7caf286
Replaces the ghost role alert ping with an unique sound, and decrease…
Daylight2 Jan 6, 2024
420ca55
fix (#23587)
Christasmurf Jan 6, 2024
10f3d6a
Clown cake can now be sliced. (#23591)
Mitchs98 Jan 6, 2024
73d50f9
Add immunity to ash storm for possessed objects and swords (#23596)
PIerreLouisH Jan 6, 2024
cae6017
Bomber Jacket resprite + departmental expansion (#23599)
Christasmurf Jan 6, 2024
ef84354
makes endoskeleton bulky (#23601)
Mitchs98 Jan 6, 2024
89c9b09
demons and wizards no longer fall in chasms (#23603)
Qwertytoforty Jan 6, 2024
40f25b0
Instant summons no longer works on the NAD. (#23604)
Qwertytoforty Jan 6, 2024
144f2e9
Adds Two Soap Crates (#23606)
PopeDaveThe3th Jan 6, 2024
150d736
remind me never to add a food item again (#23607)
Qwertytoforty Jan 6, 2024
962817a
Add check for non-clonable species (body) before brain check (#23609)
PIerreLouisH Jan 6, 2024
83ec42e
sleepers no longer check for crisis (#23623)
HMBGERDO Jan 6, 2024
b10dd15
oops (#23631)
Qwertytoforty Jan 6, 2024
1e93bf7
alloweditems (#23637)
Christasmurf Jan 6, 2024
16e000e
Redspace Purge (#23641)
PopeDaveThe3th Jan 6, 2024
0952977
mhm (#23642)
OctusGit Jan 6, 2024
32cecc6
Fixes an issue with the destroy ai objective not updating + adds a st…
Contrabang Jan 6, 2024
c16c620
pulse demons can now ai click doors without runtiming (#23649)
Qwertytoforty Jan 6, 2024
0f53ced
ai mind (#23651)
Contrabang Jan 6, 2024
17201fe
rename + file (#23653)
Oyu07 Jan 6, 2024
54e1bfd
Fixes an oversight with grep checking for conditional spaces (#23658)
Contrabang Jan 6, 2024
75f3a51
Metastation: Maintenance Rework [Part 2] (#23164)
Venuska1117 Jan 6, 2024
0ba861d
IPC wont lose their hair after death (#23627)
Yata9ar4su Jan 6, 2024
e91dce3
TG Double Examine (#23477)
OctusGit Jan 6, 2024
fad6509
Removes most hardsuits from the code, replaces with MODsuits where ap…
DGamerL Jan 6, 2024
382a71d
Renames all typepaths + names of implants to biochips (#23172)
DGamerL Jan 6, 2024
1a29419
Test time (#23734)
DGamerL Jan 6, 2024
95c86c5
Converts no slip into a trait (#23140)
BiancaWilkson Jan 6, 2024
37879c5
Boxes new sprites & little refactor (#23213)
AyIong Jan 6, 2024
8eba366
Ports Abductee Objectives (#23655)
KingSuperBOB Jan 6, 2024
44cde7c
blackbox logging for biohazards (#23309)
Qwertytoforty Jan 6, 2024
029aa11
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
AyIong Jan 7, 2024
91b2549
Merge branch 'ParadiseSS13-master' into merge_upstream
AyIong Jan 7, 2024
99eee42
Merge Tweaks
AyIong Jan 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions _maps/map_files/Delta/delta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2641,7 +2641,7 @@
/area/station/maintenance/electrical_shop)
"aqx" = (
/obj/structure/table/wood,
/obj/item/storage/box/matches,
/obj/item/storage/fancy/matches,
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/electrical_shop)
"aqy" = (
Expand Down Expand Up @@ -9183,7 +9183,7 @@
pixel_y = 5
},
/obj/item/storage/fancy/cigarettes/cigpack_random,
/obj/item/storage/box/matches,
/obj/item/storage/fancy/matches,
/turf/simulated/floor/plasteel/dark,
/area/station/service/bar)
"aGG" = (
Expand Down Expand Up @@ -67421,7 +67421,7 @@
"dEV" = (
/obj/structure/table/wood,
/obj/item/clothing/mask/cigarette/pipe,
/obj/item/storage/box/matches,
/obj/item/storage/fancy/matches,
/obj/structure/sign/poster/official/random{
pixel_y = 32
},
Expand Down Expand Up @@ -85195,7 +85195,7 @@
"naA" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
/obj/item/storage/box/matches,
/obj/item/storage/fancy/matches,
/obj/item/storage/fancy/cigarettes/cigpack_robust,
/obj/effect/spawner/lootdrop/maintenance/three,
/turf/simulated/floor/plating,
Expand Down
Loading