qweq12yt
4e8b02dd75
restored the serving tray to the autholathes
2021-09-27 17:38:28 -03:00
qweq12yt
0bb9b23537
restore spray bottle sounds
2021-09-27 17:32:07 -03:00
qweq12yt
91a738fb9e
fix canisters
2021-09-27 17:17:16 -03:00
WanderingFox95
4e87044845
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-27 18:15:34 +02:00
Hatterhat
d3704b845c
Merge branch 'master' into saiga-ballin
2021-09-26 21:41:00 -05:00
keronshb
3bda0e9015
Pirate fix
2021-09-26 21:00:48 -04:00
silicons
ec3fbed5bb
Merge pull request #15205 from zeroisthebiggay/patch-28
...
fixes code\modules\mob\living\simple_animal\hostile\plaguerat.dm:139:warning: newmouse: variable defined but not used
2021-09-26 13:30:40 -07:00
silicons
6c00bb8dce
Update living_blocking_parrying.dm ( #15208 )
2021-09-26 15:41:09 +02:00
zeroisthebiggay
be82bd310e
Update plaguerat.dm
2021-09-25 19:17:43 -04:00
zeroisthebiggay
58df5b70bf
Update plaguerat.dm
2021-09-25 19:09:22 -04:00
Hatterhat
e141df3600
weirdchamp
2021-09-24 23:16:46 -05:00
Hatterhat
fd6e97b935
grr
2021-09-24 23:08:15 -05:00
zerothebigboy
3e1f5326e3
buggers
2021-09-24 22:25:53 -04:00
Lin
c991a3004a
Merge pull request #15192 from buffyuwu/accordion
...
ports a downstream fix of accordions
2021-09-24 19:14:14 -05:00
Hatterhat
784cd2ca7d
ballin
2021-09-24 19:12:04 -05:00
keronshb
a6bfff92cc
Fixes pirates, re adds extended, re adds voting
2021-09-24 19:40:56 -04:00
zeroisthebiggay
662807042d
Update uplink_dangerous.dm
2021-09-23 22:14:09 -04:00
keronshb
c9697f4bbf
Fixes dynamic
2021-09-23 19:38:15 -04:00
WanderingFox95
9464ad8061
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-24 00:59:57 +02:00
zeroisthebiggay
7ba7f0d1c1
gremlins become shock immune ( #15183 )
...
* Update gremlin.dm
* Update gremlin.dm
2021-09-23 19:20:15 +02:00
Lin
f8ac9af6d0
Merge pull request #15187 from KrabSpider/krabgenics
...
blacklists cryogenics from anomaly spawns
2021-09-22 14:50:28 -05:00
Lin
4e9e98367f
Merge pull request #15190 from buffyuwu/canvas
...
adds art supplies to the fun vendor
2021-09-22 14:49:57 -05:00
buffyuwu
2522b84667
ports a downstream fix of accordions
...
while fixing this downstream at fortuna i realized we hadn't fixed this upstream whee
2021-09-22 01:56:13 -04:00
keronshb
271047cf9f
Ninja Change
2021-09-21 17:42:02 -04:00
WanderingFox95
d8aa29a16e
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-21 14:49:15 +02:00
buffyuwu
dbd6014129
adds art supplies to the fun vendor
...
because some maps don't have the canvas/easel
🆑
add: canvas and spraycan are now sold in the fun vendor
/🆑
2021-09-21 01:16:03 -04:00
Lin
ad4cb7ea0e
Merge pull request #15182 from Citadel-Station-13/silicons-patch-3
...
reverts my limb damage changes
2021-09-21 00:00:20 -05:00
Lin
a084733397
Merge pull request #15179 from Citadel-Station-13/why
...
adds policy configs for elite fauna and prisoner role
2021-09-20 23:58:21 -05:00
Lin
318a80370e
Merge pull request #15184 from Citadel-Station-13/silicons-patch-5
...
Fixes crawling not overriding new reagent speedups
2021-09-20 23:53:26 -05:00
buffyuwu
eb43981dea
adds 4 loadout jackets
...
more clothing ported from RP/existing TG assets with minor edits on some. available in loadout for pre-round selection and character customization.
also fixes flannels by porting additional sprites so they can now be closed/opened. note: this changes some of the flannel /obj/ paths from example: /obj/item/clothing/suit/jacket/flannel/brown
TO
/obj/item/clothing/suit/toggle/jacket/flannel/brown
🆑
fix: flannels can now be toggled in style
add: ports more rp and existing tg assets with minor edits into loadout
/🆑
2021-09-20 19:04:47 -04:00
KrabSpider
11a414d8c8
blacklists cryogenics from anomaly spawns
...
adds cryogenics to the anomaly blacklist.
2021-09-20 16:41:40 -04:00
zerothebigboy
9b3d8ab01e
wowihatemapping
2021-09-20 14:30:44 -04:00
WanderingFox95
c99df01c87
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-20 00:16:27 +02:00
keronshb
c8814e8cc8
Merge remote-tracking branch 'upstream/master' into dynamicport
2021-09-19 18:09:18 -04:00
keronshb
cd00d1589e
fucking hell
2021-09-19 18:06:24 -04:00
keronshb
13323d2597
Merge branch 'master' into dynamicport
2021-09-19 17:59:09 -04:00
keronshb
0b5a7c9759
OOPS FORGOT PIRATES and some blacklists
2021-09-19 17:56:26 -04:00
silicons
17cd5c5d84
Update mobs.dm
2021-09-19 13:46:08 -07:00
zeroisthebiggay
7fce515ca4
Update robot_modules.dm
2021-09-19 16:01:29 -04:00
zeroisthebiggay
4ab88cfcdb
Update robot_modules.dm
2021-09-19 15:59:45 -04:00
zeroisthebiggay
2f903353a6
Update robot_modules.dm
2021-09-19 15:56:40 -04:00
WanderingFox95
fe8a652689
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-19 21:32:03 +02:00
zerothebigboy
c6ce359cda
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# tgstation.dme
2021-09-19 15:23:52 -04:00
silicons
b752cb0af2
Update parts.dm
2021-09-19 11:38:12 -07:00
silicons
c9662f76ed
Update parts.dm
2021-09-19 11:35:52 -07:00
silicons
c60e54e0d3
Merge pull request #15074 from keronshb/paiports
...
PORTS PAI Emag Act
2021-09-19 11:12:02 -07:00
silicons
c4386c0a4f
Merge pull request #15175 from buffyuwu/hallucination
...
meme pr that adds a hallunciation sound
2021-09-19 11:11:05 -07:00
silicons
f48bf3cdc0
Merge pull request #15174 from buffyuwu/holoparasites
...
probably fixes holoparasites
2021-09-19 11:10:45 -07:00
silicons
97213c94d8
Merge pull request #15178 from zeroisthebiggay/soup
...
all medipens get inhands
2021-09-19 11:09:01 -07:00
silicons
ae1b7803fa
Merge pull request #15172 from Putnam3145/bonfire-always-works-lavaland
...
Massively reduced oxygen req for bonfire
2021-09-19 11:08:56 -07:00
