d43d996c38
ouch
2019-11-27 06:19:17 +01:00
c67f138d23
patching some combat mode edge cases and issues.
2019-11-27 06:10:08 +01:00
4640d8495d
)
2019-11-27 05:14:08 +01:00
1f69679cfb
Ports a few telecomms updates and fixes.
2019-11-27 04:58:05 +01:00
00bc22d375
Update clockwork_marauder.dm
2019-11-26 19:27:05 -07:00
2aa0211121
Merge pull request #9906 from Xantholne/xantholne-berets02
...
[Ready] Ports/Adds new berets but I don't break the branch somehow
2019-11-26 19:26:18 -07:00
d3bce1bbcd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2019-11-27 02:59:08 +01:00
5988e4558c
> to add injury to someone you just fragged
2019-11-27 02:32:23 +01:00
4e05c27cdb
Updating supply pods code.
2019-11-27 01:54:10 +01:00
e6ecabe54c
Scanner
2019-11-26 23:23:29 +00:00
ca2467ff93
Thingie
2019-11-26 23:14:14 +00:00
ccfdb74508
Merge pull request #9882 from FestiveBall/Fersi
...
[READY] Allows addition of reagents to sleepers for injection and detection of failed organs (minor GUI tweak.)
2019-11-26 16:02:42 -07:00
6b53845f06
Merge pull request #9268 from Thalpy/FERMICHEMCurTweaks
...
[READY] [Please merge me] Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
2019-11-26 16:01:48 -07:00
8b56e25d97
Merge pull request #9920 from YakumoChen/ai-sprites
...
Ports a bunch of VG's AI sprites
2019-11-26 15:59:09 -07:00
ff5e07ac67
Update clockwork_marauder.dm
2019-11-26 15:54:15 -07:00
2f58e4527a
Update clockwork_marauder.dm
2019-11-26 15:47:04 -07:00
cf141c3a92
Update game_options.dm
2019-11-26 15:41:32 -07:00
0187b88278
Update scripture_applications.dm
2019-11-26 15:40:31 -07:00
d6d830b2ec
Morgues no longer go "ammunition depleted"
2019-11-26 22:20:52 +01:00
0b9ea6c7f0
no pedoing the AI
2019-11-26 19:58:25 +00:00
66d1b88725
Get
2019-11-25 22:23:50 -08:00
1283149fb2
also allowed wallets
2019-11-25 22:22:16 -08:00
4ffe9cd464
Update traits.dm
2019-11-25 22:53:22 -07:00
804ee207e3
Update _status_effects.dm
2019-11-25 22:52:19 -07:00
70ec955ef3
Update _status_effects.dm
2019-11-25 22:47:24 -07:00
c5e6cb8ac0
space
2019-11-26 04:08:10 +00:00
69e0f6836a
Adds a lil message so people don't spend 25 minutes trying everything
2019-11-26 04:05:43 +00:00
4e20f576e6
Merge branch 'master' into xantholne-berets02
2019-11-25 20:16:15 -07:00
495b4b6ddc
Fixes some issues
2019-11-25 20:13:07 -07:00
e686be55c5
prevent glands from spoiling
2019-11-25 21:04:01 -06:00
cc54e5230f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-11-25 21:01:25 -06:00
281ddf73ba
Ports AI console focus loss fix and fixes an error in my trimline code
...
Port of https://github.com/tgstation/tgstation/pull/44207 and I copy pasted code and missed renaming one thing.
2019-11-25 14:48:26 -07:00
8219d298a5
Merge pull request #9942 from Useroth/new-tg-plants
...
[Hotfix] Fixed the reagents in the new plants.
2019-11-25 04:39:20 -08:00
99300229a1
Fixed the reagents in the new plants.
2019-11-25 13:35:26 +01:00
639c07665d
Personal closets can use PDAs/tablets now
2019-11-25 02:00:03 -08:00
d0a5c447ce
and THIS is why you always double check your code
2019-11-24 22:04:05 -08:00
0d58e78779
it's nice for things to compile
2019-11-24 21:54:28 -08:00
4bfc7c262d
minor comment fix
2019-11-24 21:46:15 -08:00
79a64d9c63
Makes synthtissue a lil easier.
2019-11-25 03:36:39 +00:00
0075037d0f
Makes (most) dynamic rulesets lower weight if recently fired
2019-11-24 17:09:38 -08:00
6a4c959b0a
Added more crates.
2019-11-24 19:05:03 -05:00
786d40032d
Merge pull request #9922 from GrayRachnid/braintraumasport
...
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
2019-11-25 12:31:15 +13:00
0b60d5e6ef
derp
2019-11-24 17:48:09 -05:00
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
6f98efb18e
Merge pull request #9902 from Useroth/new-tg-plants
...
[TESTMERGE READY] Ported a bunch of tg hydroponics content.
2019-11-25 11:30:43 +13:00
47b5dbeaaa
Merge pull request #9625 from Ghommie/Ghommie-cit277
...
Unmodularize digi/muzzled clothing sprites.
2019-11-25 11:30:31 +13:00
7481661182
Merge pull request #9907 from Putnam3145/midround-Vr-fix
...
[DYNAMIC] Prevents VR mobs from being midround antags.
2019-11-24 20:01:36 +00:00
6a59cc1c99
Added missing jupitercup mycelium icon. Added a mutation path for galaxythistle.
2019-11-24 10:14:16 +01:00
6c51f09a82
Make organs no longer contaminable.
2019-11-23 21:14:24 -08:00
99e9c606c0
I dunno what I did but it's fixed... somehow.
2019-11-24 04:03:51 +00:00
Ghommie