Commit Graph

29065 Commits

Author SHA1 Message Date
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
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
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
KrabSpider
11a414d8c8 blacklists cryogenics from anomaly spawns
adds cryogenics to the anomaly blacklist.
2021-09-20 16:41:40 -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
silicons
a40acd3cd6 Merge pull request #15176 from buffyuwu/dogborgsleeper
fixes dogborg sleepers not working
2021-09-19 11:09:06 -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
silicons
9a393e07f8 Merge pull request #15171 from DeltaFire15/ventcrawl-I-want-to-cry
Hey raspy why can plastic golems ventcrawl even with equipment?
2021-09-19 11:08:45 -07:00
silicons
a6637584a7 Merge pull request #15169 from timothyteakettle/REDACTED
adds a new mild trauma
2021-09-19 11:08:40 -07:00
silicons
54993928b2 Merge pull request #15167 from BlueWildrose/regenerativenerf
Xenobio regenerative extract nerfing - Hold still for 5 seconds to use on others, 1 second for self, adds stackable disgust when used
2021-09-19 11:08:10 -07:00
keronshb
1f71740803 . 2021-09-19 14:08:01 -04:00
silicons
9ac585c7f4 Merge pull request #15166 from Putnam3145/wider-effective-temperature
Supermatter has capped effective temperature for power increase too
2021-09-19 11:07:45 -07:00
silicons
abb89d9af0 Merge pull request #15163 from buffyuwu/clothing
saltpr adding more suit slot clothing
2021-09-19 11:07:32 -07:00
silicons
2bf73138fa Merge pull request #15157 from DeltaFire15/nanite-storage
Storage nanite designs are no longer inaccessible
2021-09-19 11:07:13 -07:00
silicons
1c22d85061 Merge pull request #15158 from SandPoot/obscured-slots
Adds obscured slots and TRAIT_NODROP checks to the outline system
2021-09-19 11:07:08 -07:00
silicons
9d02cf4734 Merge pull request #15160 from timothyteakettle/xor-update
removes passkey from access circuits as it's not used anymore
2021-09-19 11:07:02 -07:00
silicons
df4732a6e6 Merge pull request #15161 from timothyteakettle/prefbreaking-is-bad
the mind transfer spell now releases people from vore bellies prior to the mind transfer
2021-09-19 11:06:51 -07:00
silicons
35948bec02 Merge pull request #15162 from zeroisthebiggay/patch-23
prisoners cannot latejoin anymore
2021-09-19 11:06:40 -07:00
silicons
e50125ca6b Merge pull request #15150 from Putnam3145/hacked-law-self-qdel
Makes special objective items delete on reroll
2021-09-19 11:06:29 -07:00
silicons
c04f0cb953 Merge pull request #15154 from qweq12yt/test
[Fix] Fixes Space Heater behavior
2021-09-19 11:06:15 -07:00
silicons
6db4fc303f Merge pull request #15147 from Putnam3145/monstermos-config
Adds a config entry for monstermos (disabled for now)
2021-09-19 11:06:00 -07:00
silicons
a1e27f9ad6 Merge pull request #15144 from zeroisthebiggay/spiteful
bone satchel onmob sprites
2021-09-19 11:05:18 -07:00
silicons
ffa1355a33 Merge pull request #15139 from DeltaFire15/catsurgeon-badspawn
The cat surgeon event now prefers using "safe" turfs as spawn location
2021-09-19 11:04:59 -07:00
silicons
c16f29ffb2 Merge pull request #15137 from DeltaFire15/clockcult-ai-conversion
Allows clock cultists to convert carded AIs by placing their card onto a conversion sigil
2021-09-19 11:04:50 -07:00
silicons
d90483c428 Merge pull request #15119 from keronshb/slaughterbuff
Fixes Slaughter Demon, gives it an action button, and a slight buff
2021-09-19 11:03:18 -07:00
silicons
1bc24575d4 Merge pull request #15084 from keronshb/plaguefix
Fixes Plague Rats + other buffs
2021-09-19 11:03:05 -07:00
silicons
147903f654 sigh 2021-09-19 10:57:58 -07:00
buffyuwu
8a207d7ebd three more loadout clothing items
made from (many) edits to the gothcoat and blackwizard clothing items respectively
2021-09-19 03:01:02 -04:00
silicons
849dbc7fb3 sigh 2021-09-18 19:37:24 -07:00