Commit Graph

44773 Commits

Author SHA1 Message Date
zeroisthebiggay
72cb19eb3f Update space.dm 2021-09-24 19:15:32 -04:00
zeroisthebiggay
5366a09c8b Update spaceRuinBlacklist.txt 2021-09-24 18:38:58 -04:00
zeroisthebiggay
c633c95919 Update space.dm 2021-09-24 18:35:49 -04:00
Changelogs
70cdd264dc Automatic changelog compile [ci skip] 2021-09-24 00:26:31 +00:00
CitadelStationBot
7623ea9558 Automatic changelog generation for PR #15183 [ci skip] 2021-09-23 12:20:18 -05:00
zeroisthebiggay
7ba7f0d1c1 gremlins become shock immune (#15183)
* Update gremlin.dm

* Update gremlin.dm
2021-09-23 19:20:15 +02:00
Changelogs
fc73e2944f Automatic changelog compile [ci skip] 2021-09-23 00:27:37 +00:00
CitadelStationBot
ae4f7076dc Automatic changelog generation for PR #15187 [ci skip] 2021-09-22 14:50:30 -05:00
Lin
f8ac9af6d0 Merge pull request #15187 from KrabSpider/krabgenics
blacklists cryogenics from anomaly spawns
2021-09-22 14:50:28 -05:00
CitadelStationBot
e8617448ef Automatic changelog generation for PR #15190 [ci skip] 2021-09-22 14:50:00 -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
Changelogs
989888fb24 Automatic changelog compile [ci skip] 2021-09-22 00:26:18 +00: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
CitadelStationBot
a81238f50d Automatic changelog generation for PR #15182 [ci skip] 2021-09-21 00:00:22 -05: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
CitadelStationBot
c73455da7a Automatic changelog generation for PR #15181 [ci skip] 2021-09-20 23:59:56 -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
CitadelStationBot
ff64050f8a Automatic changelog generation for PR #15184 [ci skip] 2021-09-20 23:53:29 -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
KrabSpider
11a414d8c8 blacklists cryogenics from anomaly spawns
adds cryogenics to the anomaly blacklist.
2021-09-20 16:41:40 -04:00
Changelogs
605aa0aa11 Automatic changelog compile [ci skip] 2021-09-20 00:29:38 +00:00
CitadelStationBot
433a92908e Automatic changelog generation for PR #14219 [ci skip] 2021-09-19 16:54:39 -05:00
silicons
e06926899d Merge pull request #14219 from zeroisthebiggay/ninjasarecum
[DONE basically] ports TG ninja rework plus tons of stuff
2021-09-19 14:54:37 -07: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
zeroisthebiggay
03704c054a Update tgstation.dme 2021-09-19 15:31:34 -04:00
zeroisthebiggay
e5b2ab19c0 Update tgstation.dme 2021-09-19 15:27:51 -04:00
zeroisthebiggay
d6516d25de Update tgstation.dme 2021-09-19 15:27:23 -04:00
zerothebigboy
ce43b1b49e Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum
# Conflicts:
#	tgstation.dme
2021-09-19 15:25:42 -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
CitadelStationBot
5aea7175ea Automatic changelog generation for PR #15074 [ci skip] 2021-09-19 13:12:05 -05: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
CitadelStationBot
eff5f97020 Automatic changelog generation for PR #15174 [ci skip] 2021-09-19 13:10:47 -05:00
silicons
f48bf3cdc0 Merge pull request #15174 from buffyuwu/holoparasites
probably fixes holoparasites
2021-09-19 11:10:45 -07:00
CitadelStationBot
88428d248b Automatic changelog generation for PR #15133 [ci skip] 2021-09-19 13:10:31 -05:00
silicons
2c8d362dd5 Merge pull request #15133 from zeroisthebiggay/patch-21
the timeframely tips update
2021-09-19 11:10:28 -07:00
CitadelStationBot
da2ca355f1 Automatic changelog generation for PR #15094 [ci skip] 2021-09-19 13:09:57 -05:00
silicons
8d914571e8 Merge pull request #15094 from zeroisthebiggay/patch-20
removes building (fortnite) windows
2021-09-19 11:09:55 -07:00
CitadelStationBot
608cb77919 Automatic changelog generation for PR #15176 [ci skip] 2021-09-19 13:09:09 -05:00
silicons
a40acd3cd6 Merge pull request #15176 from buffyuwu/dogborgsleeper
fixes dogborg sleepers not working
2021-09-19 11:09:06 -07:00
CitadelStationBot
20feb1b3aa Automatic changelog generation for PR #15178 [ci skip] 2021-09-19 13:09:03 -05:00