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

Merging shiptest updates MINUS the drinkening. #12

Merged
merged 76 commits into from
Jun 23, 2024
Merged

Merging shiptest updates MINUS the drinkening. #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
d0d7aeb
Adds one Raksha Helmet to the sergeant's locker on the PGFN Crying Su…
DIB-DOG Jun 15, 2024
f855059
Automatic changelog generation for PR #3096 [ci skip]
actions-user Jun 15, 2024
73e70af
Automatic changelog compile [ci skip]
actions-user Jun 16, 2024
40cf3d4
Additional SUNS decals i missed, creates a decals folder (#3104)
meemofcourse Jun 16, 2024
381a125
Automatic changelog generation for PR #3104 [ci skip]
actions-user Jun 16, 2024
3051f1b
Automatic changelog compile [ci skip]
actions-user Jun 17, 2024
6b3d550
The Drinkening (#3019)
GenericDM Jun 17, 2024
2c47c8d
Automatic changelog generation for PR #3019 [ci skip]
actions-user Jun 17, 2024
b2b2ebf
Does some things with customizable foods and in short you can use org…
SomeguyManperson Jun 17, 2024
50870b0
Automatic changelog generation for PR #2981 [ci skip]
actions-user Jun 18, 2024
d75661c
Automatic changelog compile [ci skip]
actions-user Jun 18, 2024
9357f0a
Saint Roumain Militia Content Expansion Part 2: New Jobs! (#3119)
Imaginos16 Jun 18, 2024
2eb6ae9
Automatic changelog generation for PR #3119 [ci skip]
actions-user Jun 18, 2024
b910ad5
fixes some of the do afters working (#3072)
FalloutFalcon Jun 18, 2024
69b6b5c
Automatic changelog generation for PR #3072 [ci skip]
actions-user Jun 18, 2024
d98aa76
Mob trophies will no longer attempt to drop if there aren't any (#3116)
SomeguyManperson Jun 18, 2024
976ea89
Automatic changelog generation for PR #3116 [ci skip]
actions-user Jun 18, 2024
ecfe609
Removes generic_adjective sanity check (#3097)
Anticept Jun 18, 2024
f4ec4b8
Automatic changelog generation for PR #3097 [ci skip]
actions-user Jun 18, 2024
7f06c3a
Fix: Atmos gas mask sprite and duplicate deletion (#3109)
Yata9ar4su Jun 18, 2024
968a79d
Automatic changelog generation for PR #3109 [ci skip]
actions-user Jun 18, 2024
4a0299e
Automatic changelog compile [ci skip]
actions-user Jun 19, 2024
05afbe0
Mild Zero Gravity Buff AKA Tables Are Below Me (#3099)
Skies-Of-Blue Jun 19, 2024
931be64
Automatic changelog generation for PR #3099 [ci skip]
actions-user Jun 19, 2024
4c7b4a7
Strips limb armour from Gezena + normal gun storage (#3125)
generalthrax Jun 19, 2024
c1b18c8
Automatic changelog generation for PR #3125 [ci skip]
actions-user Jun 19, 2024
f34dd6b
fixes the black market sawn illestren to actually be sawed off (#3123)
generalthrax Jun 19, 2024
a52d8f9
Automatic changelog generation for PR #3123 [ci skip]
actions-user Jun 19, 2024
8cdaa01
Energy/Laser guns display their charge and how many shots they have l…
Gristlebee Jun 19, 2024
7b66c26
Automatic changelog generation for PR #3100 [ci skip]
actions-user Jun 19, 2024
a32eb29
Gives SRM Cabinets Cabinet Sounds (#3122)
Sadhorizon Jun 19, 2024
4da13ef
Automatic changelog generation for PR #3122 [ci skip]
actions-user Jun 19, 2024
8eb5b20
Reduces the orice of 9mm bullets so they arent objectively worse than…
SomeguyManperson Jun 19, 2024
6585fe2
Automatic changelog generation for PR #3113 [ci skip]
actions-user Jun 19, 2024
3245fe3
reverts enabling debug some extra verbs by default (#3076)
FalloutFalcon Jun 19, 2024
7924ea9
Automatic changelog generation for PR #3076 [ci skip]
actions-user Jun 19, 2024
fa32a38
Automatic changelog compile [ci skip]
actions-user Jun 20, 2024
5976ffa
Bump ws from 7.5.3 to 7.5.10 in /tgui (#3120)
dependabot[bot] Jun 20, 2024
3925680
refresh:clip part 2.5: pride month speial (#3108)
rye-rice Jun 20, 2024
4e9eb3d
Automatic changelog generation for PR #3108 [ci skip]
actions-user Jun 20, 2024
80f80c4
adds hydrogen, ice, and combustion thrusters! (#2431)
Thera-Pissed Jun 20, 2024
4dcb6f1
Automatic changelog generation for PR #2431 [ci skip]
actions-user Jun 20, 2024
0b9b82f
Adds a new ammo type, 44 Roumain, used by the Montagne and Shadow rev…
Martinpachu Jun 20, 2024
329760b
Makes motorized wheelchairs consume a reasonable amount of power (#3102)
Gristlebee Jun 20, 2024
f587c83
Automatic changelog generation for PR #3102 [ci skip]
actions-user Jun 20, 2024
0ecc4ba
Wallets and Bank Cards (#2979)
FalloutFalcon Jun 20, 2024
49dab68
Automatic changelog generation for PR #2979 [ci skip]
actions-user Jun 20, 2024
901a1a7
Automatic changelog compile [ci skip]
actions-user Jun 21, 2024
6f675a9
tailthump emote tied to tail instead of species (#3124)
generalthrax Jun 21, 2024
371d7aa
Automatic changelog generation for PR #3124 [ci skip]
actions-user Jun 21, 2024
852e2df
Readjusted kepori whistle and click volume (#3126)
Anticept Jun 21, 2024
05aaab0
Automatic changelog generation for PR #3126 [ci skip]
actions-user Jun 21, 2024
278b41c
Permanently and horribly kills decay generators while fixing actual e…
SomeguyManperson Jun 21, 2024
f279123
Automatic changelog generation for PR #3091 [ci skip]
actions-user Jun 21, 2024
7d242cb
Reduces the number of skulls spawned by crystal legion by 1 (#3117)
SomeguyManperson Jun 21, 2024
83b1b6e
Automatic changelog generation for PR #3117 [ci skip]
actions-user Jun 21, 2024
09022aa
tadrixxfloat has a sprite now (#3133)
generalthrax Jun 21, 2024
d938bc2
Automatic changelog generation for PR #3133 [ci skip]
actions-user Jun 21, 2024
e311694
Unflips the blue wall closet. (#3131)
Sadhorizon Jun 21, 2024
66019ab
Automatic changelog generation for PR #3131 [ci skip]
actions-user Jun 21, 2024
eef0591
Reflavors tribal talismans. (#3130)
Sadhorizon Jun 21, 2024
2dc0fbf
Automatic changelog generation for PR #3130 [ci skip]
actions-user Jun 21, 2024
8d1daa5
adds telegraphing to brimdemon attacks (#3107)
SomeguyManperson Jun 21, 2024
c251b00
Automatic changelog generation for PR #3107 [ci skip]
actions-user Jun 21, 2024
d17d273
Removes shoddy 'active' state for holopads that was causing negative …
Thera-Pissed Jun 21, 2024
a061915
Automatic changelog generation for PR #3128 [ci skip]
actions-user Jun 21, 2024
8e2cde7
Fixes SUNS Decals By A Few Pixels (#3134)
Imaginos16 Jun 21, 2024
3985204
Automatic changelog generation for PR #3134 [ci skip]
actions-user Jun 21, 2024
1e2fefe
Remove superfluous logic in revolver/rack() (#3127)
blinkdog Jun 21, 2024
733123c
Automatic changelog generation for PR #3127 [ci skip]
actions-user Jun 21, 2024
080c889
Fixes broken mapping versions of volume pumps for SDMM (#3118)
Thera-Pissed Jun 21, 2024
0bd31f7
Automatic changelog generation for PR #3118 [ci skip]
actions-user Jun 21, 2024
7d149cd
Automatic changelog compile [ci skip]
actions-user Jun 22, 2024
396271f
Merge branch 'shiptest-ss13:master' into host-fix
Constellado Jun 22, 2024
8d953ba
reverts the drinkening
Constellado Jun 23, 2024
18c34fd
dmi fix
Constellado Jun 23, 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
1 change: 0 additions & 1 deletion _maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,6 @@
/obj/item/clothing/under/rank/cargo/miner,
/obj/item/clothing/suit/hooded/wintercoat/miner,
/obj/item/clothing/shoes/winterboots,
/obj/item/card/id/mining,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/ruin/powered)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2068,7 +2068,7 @@
"sa" = (
/obj/effect/turf_decal/rechargefloor,
/obj/effect/turf_decal/industrial/warning/dust,
/obj/effect/spawner/lootdrop/whiteship_cere_ripley,
/obj/effect/spawner/lootdrop/ripley,
/turf/open/floor/plasteel/mono/dark,
/area/ruin/rockplanet/shippingdockwarehouse)
"sc" = (
Expand Down
12 changes: 6 additions & 6 deletions _maps/RandomRuins/SpaceRuins/spacemall.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9901,12 +9901,12 @@
"Lx" = (
/obj/structure/rack,
/obj/effect/turf_decal/corner/opaque/blue/half,
/obj/item/clothing/accessory/talisman,
/obj/item/clothing/accessory/wolftalisman,
/obj/item/clothing/accessory/talisman,
/obj/item/clothing/accessory/talisman,
/obj/item/clothing/accessory/wolftalisman,
/obj/item/clothing/accessory/wolftalisman,
/obj/item/clothing/accessory/bonearmlet,
/obj/item/clothing/neck/fangnecklace,
/obj/item/clothing/accessory/bonearmlet,
/obj/item/clothing/accessory/bonearmlet,
/obj/item/clothing/neck/fangnecklace,
/obj/item/clothing/neck/fangnecklace,
/obj/item/clothing/accessory/skilt,
/obj/item/clothing/accessory/skilt,
/obj/item/clothing/accessory/skilt,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
/area/ruin/powered)
"fq" = (
/obj/structure/table,
/obj/item/ammo_box/c45_speedloader,
/obj/item/ammo_box/a44roum_speedloader,
/turf/open/floor/plasteel/mono/white,
/area/ruin/powered)
"fJ" = (
Expand Down
15 changes: 14 additions & 1 deletion _maps/configs/srm_elder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,30 @@
"officer": true,
"slots": 1
},
"Hunter Colligne": {
"outfit": "/datum/outfit/job/roumain/hop",
"officer": true,
"slots": 1
},
"Hunter Doctor": {
"outfit": "/datum/outfit/job/roumain/doctor",
"slots": 1
},
"Machinist": {
"outfit": "/datum/outfit/job/roumain/engineer",
"slots": 1
},
"Hunter": {
"outfit": "/datum/outfit/job/roumain/security",
"slots": 3
},
"Flamebearer": {
"outfit": "/datum/outfit/job/roumain/flamebearer",
"slots": 1
},
"Shadow": {
"outfit": "/datum/outfit/job/roumain/assistant",
"slots": 3
"slots": 2
}
},
"enabled": true
Expand Down
Loading
Loading