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 03.10.2024 #1574

Merged
merged 51 commits into from
Oct 4, 2024
Merged

merge upstream 03.10.2024 #1574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
2a58ce0
Gives all status effects an ID (#26880)
DGamerL Sep 27, 2024
900271a
Updates OD lints (#26729)
Contrabang Sep 27, 2024
a42b91e
blackbox: Add accumulating feedback types for numeric and text values…
warriorstar-orion Sep 27, 2024
594ff57
Non fulltile windows don't get blood on them, spacecleaner cleans blo…
Qwertytoforty Sep 27, 2024
2d7d4fa
wire cutters (#26921)
lewcc Sep 27, 2024
30c8f94
fixes surgery again please fuck (#26922)
Qwertytoforty Sep 28, 2024
359739b
fax CC to change lawset (#26882)
Coolrune206 Sep 28, 2024
ff76ba2
Fix: No more burnt hermit (#26898)
PollardTheDragon Sep 28, 2024
0f58720
Added shadowperson healing case for when inside locker (#26837)
leoworm Sep 28, 2024
294d4f1
[FIX] Apex predator can no longer target yourself (#26902)
Adrer Sep 28, 2024
b61f4f3
feat: Storage shelves and gun racks. (#26744)
warriorstar-orion Sep 28, 2024
20258e7
Makes the ID machine no longer remove extra access when you get all a…
Truls20 Sep 28, 2024
a422b25
Syndie depot loses it's GPS (#26883)
kyunkyunkyun Sep 28, 2024
fafb2d6
fix: headphone music notes updating / admin musician outfit (#26814)
warriorstar-orion Sep 28, 2024
c6f9a5e
You can now emag humans again (#26857)
Qwertytoforty Sep 28, 2024
882b1e4
Fixes safe being unable to pick up spawner/random/ (#26891)
kyunkyunkyun Sep 29, 2024
d652943
Prevent sleeps in key handling from blocking SSinput (#26761)
FunnyMan3595 Sep 29, 2024
29309ef
fixes my math (#26933)
BiancaWilkson Sep 29, 2024
ab39d2d
the codebase has gotten 1% more cringe (#26915)
BiancaWilkson Sep 29, 2024
04c110c
Update shelves.dm (#26938)
1080pCat Sep 29, 2024
a4d7950
[s] Makes powerfists a bit more sane (#26939)
DGamerL Sep 29, 2024
0d79dc6
New sounds for welcoming the crew to the station (#26666)
Code-Lyoko0 Sep 30, 2024
b1be7cc
Commit Acces to Maintainer Initial (#26920)
Burzah Sep 30, 2024
666713e
[FIX] Guardian health HUD now updates properly when host health chang…
Adrer Oct 1, 2024
6c38283
fix: handle resizing shelf items from non-player movement (#26940)
warriorstar-orion Oct 1, 2024
603d717
Makes the BRPD fit in belts (#26911)
DGamerL Oct 1, 2024
2773249
Such a hard thing to code (#26912)
DGamerL Oct 1, 2024
f2efdcf
Fixes lighting emissive blockers becoming irradiated (#26931)
Migratingcocofruit Oct 1, 2024
0f5d71b
Add decals to walls banned neighbors (#26849)
AyIong Oct 1, 2024
224d053
Removes Princess of Terror RNG (#26910)
PopeDaveThe3th Oct 1, 2024
e118716
HAUUUUUUUUGH (#26959)
Qwertytoforty Oct 2, 2024
2d58d8e
lowers succumb threshold to 130 damage (#26941)
silverplatedelta Oct 2, 2024
fe83fe8
Lets cyborgs pick up catwalk tiles (#26944)
Truls20 Oct 2, 2024
e5320b5
Creation (#26765)
Fordoxia Oct 2, 2024
54e35bc
Allows multitile to work with arbitrary list lengths (#26801)
Migratingcocofruit Oct 2, 2024
8530ac4
Adds borgi undershirt (#26824)
whataboutism-alos Oct 2, 2024
c340f22
blackbox: Record ghost role spawns. (#26906)
warriorstar-orion Oct 2, 2024
b91fb66
Event huds can now be found with ahud (#26916)
silverplatedelta Oct 2, 2024
ba752d1
The amplified drill actually heals IPCs for more than just stamina da…
WenlockTheBritishHobo Oct 2, 2024
e9ea474
Adds 0.75 toolspeed to medical wrench to put it in line with the othe…
Truls20 Oct 2, 2024
07bd88a
Fixes N2O not decomposing above 100000 Kelvin (#26817)
Migratingcocofruit Oct 2, 2024
95f2c7e
fixing judo (#26755)
kyunkyunkyun Oct 2, 2024
6ca35f3
Ah Ah Ah, you didn't say the magic word (#26966)
Qwertytoforty Oct 2, 2024
8307b06
fix: make food on shelves ant-proof (#26961)
warriorstar-orion Oct 3, 2024
95888bb
Add Seppuku to the Captain Saber (#26936)
Kenionatus Oct 3, 2024
e5d1e09
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Legendaxe Oct 3, 2024
41481de
hev_suit handle_speech fix
Legendaxe Oct 3, 2024
bffaf24
camera linter fix
Legendaxe Oct 3, 2024
afb066d
updatePaths
Legendaxe Oct 3, 2024
42b7458
map linter fix
Legendaxe Oct 3, 2024
760ed92
replace modular gunracks with upstream gunracks
Legendaxe Oct 3, 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
2 changes: 1 addition & 1 deletion SQL/paradise_schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ CREATE TABLE `feedback` (
`datetime` datetime NOT NULL,
`round_id` int(8) NOT NULL,
`key_name` varchar(32) NOT NULL,
`key_type` enum('text', 'amount', 'tally', 'nested tally', 'associative') NOT NULL,
`key_type` ENUM('text', 'amount', 'tally', 'nested tally', 'associative', 'ledger', 'nested ledger') NOT NULL,
`version` tinyint(3) UNSIGNED NOT NULL,
`json` LONGTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
PRIMARY KEY (`id`)
Expand Down
23 changes: 23 additions & 0 deletions SQL/updates/59-60.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
-- Migration: 59-60
-- Author: warriorstar
-- Introduced: PR# 26645

-- This migration adds the 'ledger' and 'nested ledger' enum values to the
-- `feedback` table in conjunction with making those feedback types available
-- through SSblackbox.
-- No data migration is required.

ALTER TABLE
`feedback`
MODIFY
COLUMN `key_type` ENUM(
'text',
'amount',
'tally',
'nested tally',
'associative',
'ledger',
'nested ledger'
) NOT NULL
AFTER
`key_name`;
23 changes: 5 additions & 18 deletions _maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,13 +723,6 @@
/obj/item/stack/sheet/metal,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/althland_excavation)
"jT" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall/r_wall,
/area/ruin/unpowered/althland_excavation)
"kh" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/mecha_wreckage/ripley,
Expand Down Expand Up @@ -786,7 +779,6 @@
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/althland_excavation)
"nw" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/damageturf,
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall/r_wall,
Expand Down Expand Up @@ -873,11 +865,6 @@
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall/r_wall,
/area/ruin/unpowered/althland_excavation)
"sp" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall/r_wall,
/area/ruin/unpowered/althland_excavation)
"sA" = (
/obj/structure/railing,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -1679,13 +1666,13 @@ yb
bO
nw
gh
jT
TN
Wt
RG
tj
jT
TN
Zy
sp
TN
aq
dp
Cs
Expand All @@ -1702,7 +1689,7 @@ oh
Mm
Mm
TN
sp
TN
aU
Lt
am
Expand Down Expand Up @@ -1828,7 +1815,7 @@ Ei
(9,1,1) = {"
Mm
TN
sp
TN
bC
zw
TN
Expand Down
46 changes: 9 additions & 37 deletions _maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,12 +409,6 @@
/obj/structure/ore_box,
/turf/simulated/floor/plasteel/lavaland_air,
/area/ruin/unpowered/althland_processing)
"nX" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/stack/ore,
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall/r_wall,
/area/ruin/unpowered/althland_processing)
"oj" = (
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/althland_processing)
Expand Down Expand Up @@ -517,12 +511,6 @@
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating/lavaland_air,
/area/lavaland/surface/outdoors)
"sv" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random_spawners/wall_rusted_always,
/turf/simulated/wall/r_wall,
/area/ruin/unpowered/althland_processing)
"sB" = (
/obj/effect/mapping_helpers/no_lava,
/obj/structure/disposalpipe/trunk,
Expand Down Expand Up @@ -759,11 +747,6 @@
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating/lavaland_air,
/area/lavaland/surface/outdoors)
"AT" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/wall/r_wall,
/area/ruin/unpowered/althland_processing)
"BB" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/portable/pump,
Expand All @@ -785,11 +768,6 @@
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/althland_processing)
"BO" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall/r_wall,
/area/ruin/unpowered/althland_processing)
"BV" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/damageturf,
Expand Down Expand Up @@ -1213,12 +1191,6 @@
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"QE" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall/r_wall,
/area/ruin/unpowered/althland_processing)
"RL" = (
/obj/item/stack/sheet/metal{
amount = 5
Expand Down Expand Up @@ -1726,7 +1698,7 @@ KZ
ab
ui
ui
QE
ui
Lg
ui
ab
Expand Down Expand Up @@ -1773,7 +1745,7 @@ jb
ab
ab
ui
QE
ui
af
BM
Hz
Expand Down Expand Up @@ -1811,7 +1783,7 @@ ab
ab
af
af
AT
Au
Wb
kR
fc
Expand Down Expand Up @@ -1871,7 +1843,7 @@ bT
JT
zZ
qn
nX
ui
ui
ui
VJ
Expand Down Expand Up @@ -1957,7 +1929,7 @@ bT
um
um
ui
BO
ui
zR
ui
bT
Expand Down Expand Up @@ -2016,7 +1988,7 @@ ui
iq
MO
eH
BO
ui
ab
ap
ab
Expand Down Expand Up @@ -2158,7 +2130,7 @@ ab
ab
ui
ui
BO
ui
ui
ui
ab
Expand Down Expand Up @@ -2308,7 +2280,7 @@ bT
ui
ui
nK
sv
um
lZ
ui
Yd
Expand Down Expand Up @@ -2596,7 +2568,7 @@ af
af
ui
ui
BO
ui
ho
ui
bT
Expand Down
7 changes: 1 addition & 6 deletions _maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,9 @@
/turf/simulated/wall/mineral/iron,
/area/ruin/powered)
"d" = (
/obj/item/clothing/head/helmet/space/syndicate/orange,
/obj/item/clothing/mask/breath,
/turf/simulated/floor/plating,
/area/ruin/powered)
"e" = (
/obj/item/clothing/suit/space/syndicate/orange,
/turf/simulated/floor/plating,
/area/ruin/powered)
"g" = (
/turf/simulated/floor/plating/asteroid{
name = "dirt"
Expand Down Expand Up @@ -363,7 +358,7 @@ s
"}
(11,1,1) = {"
c
e
o
h
g
l
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"xs" = (
/obj/effect/decal/cleanable/fungus,
/obj/effect/spawner/random/fungus/frequent,
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"xQ" = (
Expand Down
8 changes: 2 additions & 6 deletions _maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5531,10 +5531,6 @@
},
/turf/simulated/floor/engine,
/area/ruin/space/moonbase19)
"sy" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/wall/r_wall,
/area/ruin/space/moonbase19)
"sF" = (
/obj/effect/spawner/random_spawners/wall_rusted_always,
/turf/simulated/wall/indestructible/riveted,
Expand Down Expand Up @@ -14703,7 +14699,7 @@ Wd
rL
mh
Mv
sy
ag
tX
tX
Dd
Expand Down Expand Up @@ -16017,7 +16013,7 @@ OZ
VR
af
bP
sy
ag
af
tX
tX
Expand Down
8 changes: 1 addition & 7 deletions _maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,12 +1173,6 @@
},
/turf/simulated/floor/plating/asteroid/airless,
/area/syndicate_depot/outer)
"dg" = (
/obj/item/gps/ruin{
gpstag = "ERR#UNKWN"
},
/turf/simulated/wall/mineral/plastitanium/nodiagonal,
/area/syndicate_depot/core)
"Te" = (
/turf/simulated/mineral/random/high_chance,
/area/syndicate_depot/outer)
Expand Down Expand Up @@ -1913,7 +1907,7 @@ aj
aj
ao
ad
dg
at
aL
aD
aZ
Expand Down
Loading
Loading