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 #760

Merged
merged 41 commits into from
Nov 24, 2023
Merged

merge upstream #760

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
f70b534
Tweaks Load Lawset to differentiate between admins and normal players…
Vi3trice Nov 21, 2023
9384c2a
Allows roundstart observers to freely use antag HUD without losing re…
lewcc Nov 21, 2023
ee4ac14
Resprites Cigars, Holocigars, Premium Cigars, Rollies, and Cigarettes…
ATP-Engineer Nov 21, 2023
8546a2c
fixes acid peels (#23298)
lewcc Nov 21, 2023
78a6198
[s] Fix cyberiad research windoor. (#23044)
Venuska1117 Nov 21, 2023
ba44b18
Removes Barber because its a poorly designed role (#23053)
OctusGit Nov 21, 2023
307120e
Patches and pills are now no longer subtypes of food (#23063)
DGamerL Nov 21, 2023
7e74694
Fixes some issues with patches and pills (#23322)
DGamerL Nov 21, 2023
207e35c
Adds 3 ipc only implants. (#22798)
Qwertytoforty Nov 21, 2023
325cd3a
fix that unisex restroom on box (#23072)
Venuska1117 Nov 21, 2023
a169176
Make dicebag not a pillbottle subtype. (#23121)
Adrer Nov 21, 2023
637373c
fixes some issues with defibs (#23276)
GDNgit Nov 22, 2023
a92428e
Adds PAI to cargo shuttle blacklist (#23284)
Adrer Nov 22, 2023
450f662
NanoMap Auto-Update (Wed Nov 22 01:14:49 UTC 2023) (#23267)
github-actions[bot] Nov 22, 2023
13432a2
we love code that compiles (#23340)
Contrabang Nov 23, 2023
7181d86
Buffs His Grace (#23040)
DGamerL Nov 24, 2023
4a34373
HUDs can now only change status with sufficient ID access (#23086)
Danchi299 Nov 24, 2023
cda62a5
Reflectors now return materials on deconstruction (#23215)
Adrer Nov 24, 2023
429981e
Nerfs baton throwing (#23241)
DGamerL Nov 24, 2023
0b4a2bb
Adds LOOC to runechat. (#23256)
lewcc Nov 24, 2023
9f9db15
Defibs now shock people giving CPR (#23257)
lewcc Nov 24, 2023
4b3a720
Removes boxes from the uplink PART 1 (#23189)
Cokecolagua Nov 24, 2023
bc7356b
The temperature gun no longer self charges. (#23260)
1080pCat Nov 24, 2023
d1374cc
Check if mob is still horizontal after starting to crawl under airloc…
Adrer Nov 24, 2023
11dc93d
fixes being unable to rename paper (#23269)
GDNgit Nov 24, 2023
a854dab
engi ert buff+little ert buff (#23270)
1080pCat Nov 24, 2023
c1900f2
[TGUI] Input List (#23281)
AyIong Nov 24, 2023
53f6b90
customised_abstract_text - removed useless check, changed var (#23282)
HMBGERDO Nov 24, 2023
f806aed
Scrubber/pump eject into hand (#23283)
Adrer Nov 24, 2023
60ee7e1
Lets lockers/crates protect food from ants (#23286)
CinnamonSnowball Nov 24, 2023
18bc753
fixes water backpacks not being able to have their miser be toggled b…
GDNgit Nov 24, 2023
0bbc523
Adds colored shoes to loadout, makes satchels craftable (#23293)
CinnamonSnowball Nov 24, 2023
bc43bda
Moves voyager.dmi into items.dmi to reduce bloat (#23295)
OctusGit Nov 24, 2023
6a109ad
Moves a few sprites out of items.dmi (#23301)
Henri215 Nov 24, 2023
96d828d
destination tagger UI improvements (#23302)
GDNgit Nov 24, 2023
94fbb46
reduces a massive amount of endround lag (#23306)
GDNgit Nov 24, 2023
0100d4c
teg hotfix (#23312)
lewcc Nov 24, 2023
f39d514
fixes xeno headslugging not working (#23317)
GDNgit Nov 24, 2023
3679215
delta: fix many grille/shock windows (#23194)
warriorstar-orion Nov 24, 2023
03ddf49
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
Legendaxe Nov 24, 2023
57bee21
map fix
Legendaxe Nov 24, 2023
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
268 changes: 182 additions & 86 deletions _maps/map_files/Delta/delta.dmm
View file
Open in desktop

Large diffs are not rendered by default.

27 changes: 13 additions & 14 deletions _maps/map_files/MetaStation/MetaStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6399,7 +6399,7 @@
pixel_x = 27
},
/obj/structure/table,
/obj/item/storage/pill_bottle/dice,
/obj/item/storage/bag/dice,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "brown"
Expand Down Expand Up @@ -6981,7 +6981,7 @@
/area/station/maintenance/fsmaint)
"aIp" = (
/obj/structure/table,
/obj/item/storage/pill_bottle/dice,
/obj/item/storage/bag/dice,
/turf/simulated/floor/plasteel,
/area/station/public/dorms)
"aIq" = (
Expand Down Expand Up @@ -11137,7 +11137,7 @@
/area/station/maintenance/fsmaint)
"aUy" = (
/obj/structure/table,
/obj/item/storage/pill_bottle/dice,
/obj/item/storage/bag/dice,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
Expand Down Expand Up @@ -15060,7 +15060,7 @@
"beK" = (
/obj/structure/table/reinforced,
/obj/item/folder/yellow,
/obj/item/reagent_containers/food/pill/patch/silver_sulf,
/obj/item/reagent_containers/patch/silver_sulf,
/obj/item/stamp/ce,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
Expand Down Expand Up @@ -23136,7 +23136,7 @@
/area/station/service/hydroponics)
"byM" = (
/obj/structure/table/wood/poker,
/obj/item/storage/pill_bottle/dice,
/obj/item/storage/bag/dice,
/turf/simulated/floor/wood,
/area/station/service/bar)
"byP" = (
Expand Down Expand Up @@ -30628,7 +30628,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/item/dice/d20,
/obj/item/dice,
/obj/item/storage/pill_bottle/dice,
/obj/item/storage/bag/dice,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"bWF" = (
Expand Down Expand Up @@ -31837,7 +31837,7 @@
name = "south bump";
pixel_y = -24
},
/obj/item/storage/pill_bottle/dice,
/obj/item/storage/bag/dice,
/obj/structure/table/wood,
/obj/machinery/camera{
c_tag = "Library Quiet Room";
Expand Down Expand Up @@ -60370,7 +60370,6 @@
name = "west bump";
pixel_x = -24
},
/obj/effect/landmark/start/barber,
/obj/machinery/power/apc{
name = "south bump";
pixel_y = -24
Expand Down Expand Up @@ -62379,18 +62378,18 @@
pixel_x = 6;
pixel_y = 8
},
/obj/item/reagent_containers/food/pill/patch/styptic{
/obj/item/reagent_containers/patch/styptic{
pixel_y = 6
},
/obj/item/reagent_containers/food/pill/patch/styptic{
/obj/item/reagent_containers/patch/styptic{
pixel_x = 2;
pixel_y = 8
},
/obj/item/reagent_containers/food/pill/patch/silver_sulf{
/obj/item/reagent_containers/patch/silver_sulf{
pixel_x = -8;
pixel_y = 6
},
/obj/item/reagent_containers/food/pill/patch/silver_sulf{
/obj/item/reagent_containers/patch/silver_sulf{
pixel_x = -8;
pixel_y = 8
},
Expand Down Expand Up @@ -74687,7 +74686,7 @@
/area/station/maintenance/fore)
"pcD" = (
/obj/structure/table,
/obj/item/storage/pill_bottle/dice,
/obj/item/storage/bag/dice,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
Expand Down Expand Up @@ -93619,7 +93618,7 @@
/area/station/science/toxins/mixing)
"xUA" = (
/obj/structure/table,
/obj/item/storage/pill_bottle/dice,
/obj/item/storage/bag/dice,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
Expand Down
5 changes: 2 additions & 3 deletions _maps/map_files/cerestation/cerestation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14429,7 +14429,7 @@
/area/station/medical/reception)
"bBs" = (
/obj/structure/table/wood,
/obj/item/storage/pill_bottle/dice,
/obj/item/storage/bag/dice,
/turf/simulated/floor/carpet,
/area/station/public/locker)
"bBt" = (
Expand Down Expand Up @@ -77253,7 +77253,7 @@
/area/station/maintenance/fore)
"rUL" = (
/obj/structure/table/wood,
/obj/item/storage/pill_bottle/dice,
/obj/item/storage/bag/dice,
/turf/simulated/floor/wood,
/area/station/service/library)
"rUQ" = (
Expand Down Expand Up @@ -93911,7 +93911,6 @@
/turf/simulated/floor/carpet/cyan,
/area/station/public/fitness)
"xhr" = (
/obj/effect/landmark/start/barber,
/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
Expand Down
Loading
Loading