silicons
|
06771cd47a
|
Merge pull request #15189 from zeroisthebiggay/minkraft
a new maintenance ambience
|
2021-09-28 00:15:16 -07:00 |
|
silicons
|
f317e510f7
|
Merge pull request #15191 from keronshb/ninjaadjustment
Puts the ninja status back into the status window and restores the energy charge meter.
|
2021-09-28 00:14:42 -07:00 |
|
silicons
|
d6e7a096e6
|
Merge pull request #15206 from zeroisthebiggay/metaprison
meta station prison remapping
|
2021-09-28 00:13:13 -07:00 |
|
silicons
|
b7476491d3
|
Merge pull request #15204 from Hatterhat/clip-delay
shotgun shell clips now have melee click delay (0.8s) with this one weird trick
|
2021-09-28 00:13:02 -07:00 |
|
silicons
|
dd6e2d7240
|
Merge pull request #15202 from Hatterhat/saiga-ballin
CCS stock safety
|
2021-09-28 00:12:54 -07:00 |
|
silicons
|
3607bbf363
|
Merge pull request #15197 from Putnam3145/up-min-lavaland-temp
Ups minimum lavaland temperature
|
2021-09-27 23:31:20 -07:00 |
|
silicons
|
cefef5b0bc
|
Merge pull request #15203 from zeroisthebiggay/buggers
Fixing (cult) slurring and stuttering never going away from non-carbon mobs.
|
2021-09-27 23:31:03 -07:00 |
|
Jordan Brown
|
2db0511d0d
|
Removes a dead var
|
2021-09-27 12:20:37 -04:00 |
|
Hatterhat
|
d3704b845c
|
Merge branch 'master' into saiga-ballin
|
2021-09-26 21:41:00 -05: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 |
|
Lin
|
27aaaecb52
|
Merge pull request #15200 from zeroisthebiggay/patch-27
fixes yet another emeraldsundisk map pr which was not spawning because the Ruin Didn't Actually Exist.
|
2021-09-26 12:04:27 -05: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 |
|
zeroisthebiggay
|
72cb19eb3f
|
Update space.dm
|
2021-09-24 19:15:32 -04:00 |
|
zeroisthebiggay
|
c633c95919
|
Update space.dm
|
2021-09-24 18:35:49 -04:00 |
|
zeroisthebiggay
|
7ba7f0d1c1
|
gremlins become shock immune (#15183)
* Update gremlin.dm
* Update gremlin.dm
|
2021-09-23 19:20:15 +02:00 |
|
Putnam3145
|
a4adf41c7c
|
Ups minimum lavaland temperature
|
2021-09-22 18:43:45 -07: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 |
|
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
|
ab7b4e3eec
|
Merge pull request #15181 from Citadel-Station-13/typecaches
no more powergaming dice bags
|
2021-09-20 23:59:53 -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
|
7a5e748344
|
Merge pull request #15185 from Citadel-Station-13/silicons-patch-6
fixes airlock deflection
|
2021-09-20 23:53:53 -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 |
|
zeroisthebiggay
|
931ffd428f
|
Update sound.dm
|
2021-09-20 23:10:08 -04:00 |
|
zerothebigboy
|
baf4b90e0c
|
lmao i love coding
|
2021-09-20 22:58:39 -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 |
|
silicons
|
6d99bca184
|
Update obj_defense.dm
|
2021-09-19 14:46:09 -07:00 |
|
silicons
|
84a26eeabd
|
Update obj_defense.dm
|
2021-09-19 14:45:24 -07: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 |
|
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
|
8d914571e8
|
Merge pull request #15094 from zeroisthebiggay/patch-20
removes building (fortnite) windows
|
2021-09-19 11:09:55 -07:00 |
|