BlackMajor
|
6624155e3d
|
Hey you know this is probably a smarter way to go about ruin spawning in station space.
|
2020-02-25 02:21:28 +13:00 |
|
BlackMajor
|
ca6341aac4
|
Merge branch 'master' into SpaceRuins
|
2020-02-24 19:47:52 +13:00 |
|
Ghom
|
565fa77cf9
|
Merge pull request #11162 from Hatterhat/quickpatch-enzyme
biogen enzyme fix, multitool basic tools node fix
|
2020-02-23 22:48:07 +01:00 |
|
kevinz000
|
ae42db8674
|
Merge pull request #11210 from Ghommie/Ghommie-cit588
[s] Fixing an issue with slot machines crashing the server.
|
2020-02-23 06:02:13 -07:00 |
|
Ghom
|
2075147ee9
|
Merge pull request #11206 from Trilbyspaceclone/patch-294
Corn dogs now have a sprite
|
2020-02-23 13:30:23 +01:00 |
|
Ghommie
|
2b740f9bad
|
[s] Fixing an issue with slot machines crashing the server.
|
2020-02-23 13:09:21 +01:00 |
|
TrilbySpaceClone
|
845e719ade
|
But what if we did it right?
|
2020-02-23 01:52:36 -05:00 |
|
Trilbyspaceclone
|
2dea3cf15c
|
Gives ash sandstone
|
2020-02-23 00:53:42 -05:00 |
|
Trilbyspaceclone
|
342f1cd4c1
|
Update snacks_meat.dm
|
2020-02-22 23:17:30 -05:00 |
|
Hatterhat
|
ba81184fef
|
Merge branch 'master' into quickpatch-enzyme
|
2020-02-22 18:06:17 -06:00 |
|
Ghom
|
0c558f53d9
|
Merge pull request #11179 from Trilbyspaceclone/patch-290
AIs now understand dwarf
|
2020-02-22 22:49:08 +01:00 |
|
Ghom
|
520f5eab83
|
Merge pull request #11191 from YakumoChen/beelord
Beegions
|
2020-02-22 22:24:20 +01:00 |
|
Ghom
|
6f181365c2
|
Merge pull request #11172 from Trilbyspaceclone/bows!
Bow corrections.
|
2020-02-22 15:53:27 +01:00 |
|
Ghom
|
b7fab93209
|
Merge pull request #11186 from Putnam3145/fixed-flavor
Fixed temp flavor text (for real)
|
2020-02-22 15:09:58 +01:00 |
|
Putnam
|
d328d554ba
|
Reduced copypasta
|
2020-02-22 02:38:57 -08:00 |
|
kevinz000
|
856af1f182
|
Merge pull request #10848 from Ghommie/Ghommie-cit229
Porting Floyd Materials: Trying again edition
|
2020-02-21 23:28:44 -07:00 |
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
YakumoChen
|
418374be06
|
beegion
|
2020-02-21 17:56:14 +00:00 |
|
Ghom
|
42416483e7
|
Merge pull request #11175 from keronshb/NaniteFixes
Fixes healing nanites
|
2020-02-21 16:46:19 +01:00 |
|
YakumoChen
|
2f2ddbad5a
|
removes density from skulls
|
2020-02-21 12:07:58 +00:00 |
|
YakumoChen
|
34f1b5d1c8
|
legion heads now swarm
|
2020-02-21 10:36:57 +00:00 |
|
Putnam
|
146b2a35f2
|
fixed temp flavor text (for real)
|
2020-02-21 00:26:42 -08:00 |
|
Trilbyspaceclone
|
38f243e1c2
|
Update language_holder.dm
|
2020-02-20 22:15:32 -05:00 |
|
Ghom
|
8395ee53e7
|
Merge pull request #11156 from Psody-Mordheim/Plzgibsynthflesh
Virology Symptom Update : Now Featuring EVEN MORE PWRGAME
|
2020-02-21 02:47:18 +01:00 |
|
Ghom
|
e92183e968
|
Merge pull request #10541 from Detective-Google/the-p-o-o-l
adds the POOL to box station
|
2020-02-21 02:43:04 +01:00 |
|
keronshb
|
7a1bc9d22b
|
Fixes the travis issues
Fixes the travis issues, Exo still remains a mystery
|
2020-02-20 19:11:04 -05:00 |
|
keronshb
|
4ca9eb4171
|
Fixes healing nanites
Fixes Accelerated Regeneration, Bio Regen, and Mechanical.
Also changed one line on Exo nanites but it doesn't fix those. Dunno what to do.
|
2020-02-20 18:11:54 -05:00 |
|
Ghom
|
613158fe4e
|
Merge pull request #11157 from Putnam3145/lick-pref
Lick pref
|
2020-02-20 20:53:27 +01:00 |
|
Ghom
|
4649183a47
|
Merge pull request #11154 from Kraseo/fuck-nightmares
Fixes nightmares deleting guns with flashlights
|
2020-02-20 20:52:29 +01:00 |
|
Ghom
|
7763475b83
|
Merge pull request #10572 from Tupinambis/SiliconDefault
Removes harm prevention clause indicators from relevant sources.
|
2020-02-20 15:33:27 +01:00 |
|
Ghom
|
6347dab0a3
|
Merge pull request #11142 from kevinz000/vampire_haste
makes vampire haste more reliable and slightly less of an example of how not to code
|
2020-02-20 15:31:39 +01:00 |
|
Ghom
|
608bb0a04c
|
Merge pull request #10649 from kevinz000/hijack
Completely reworks the hijack objective, and shuttle hijacking in general
|
2020-02-20 14:40:08 +01:00 |
|
kevinz000
|
ca777c6c8b
|
Merge pull request #11153 from Ghommie/Ghommie-cit587
Fixing addiction moodlets not going away and secret sauce recipe paper.
|
2020-02-20 06:17:33 -07:00 |
|
BlackMajor
|
cf0b1bbac6
|
Replace ablative bat with spear. Give ruins a max distance from the transit edge, to dissuade spawning too close to the station.
|
2020-02-21 00:22:50 +13:00 |
|
Ghom
|
26bbc64f16
|
Merge pull request #11136 from Owai-Seek/broomport-2-17-19
Ports Broom, Tweak Janitor Vendor
|
2020-02-20 11:48:06 +01:00 |
|
Ghom
|
d680ab9fd5
|
Merge pull request #11025 from Arturlang/TGUI_Next_Nanites
Ports TGUI Next and a lot of misc updates for nanites.
|
2020-02-20 11:27:48 +01:00 |
|
Ghom
|
32c001f264
|
Merge pull request #11140 from Citadel-Station-13/kevinz000-patch-15
buffs pai radio short 5 -> 3 minutes
|
2020-02-20 11:26:17 +01:00 |
|
Ghom
|
89f256866d
|
Merge pull request #11033 from kevinz000/cmo_drapes
gives CMO special surgery drapes that can initiate techweb surgeries without operating console
|
2020-02-20 11:24:50 +01:00 |
|
Ghom
|
f94f997cc2
|
Merge pull request #11080 from kevinz000/surubatons
hey someone gave me this idea for stunbatons (and I sort of expanded it) and it's worth a test
|
2020-02-20 11:09:46 +01:00 |
|
Ghom
|
7d8ae07fa0
|
Merge pull request #11139 from Citadel-Station-13/kevinz000-patch-12
projectiles now pierce through pAIs no matter what
|
2020-02-20 11:09:03 +01:00 |
|
Ghom
|
c1f8deb4a5
|
Merge pull request #11141 from Citadel-Station-13/kevinz000-patch-17
removes pai fulltile opacity
|
2020-02-20 11:08:27 +01:00 |
|
Ghom
|
e9d0f536de
|
Merge pull request #11146 from Putnam3145/supermatter-hardcap
Hardcaps supermatter damage from ballistics and similar
|
2020-02-20 11:08:14 +01:00 |
|
Ghom
|
1f42e9f451
|
Merge pull request #11149 from Putnam3145/fix-vendor-badcode
fixes mining vendors failing and eating your points iff you have exactly enough points
|
2020-02-20 11:07:51 +01:00 |
|
Ghom
|
22a041f72b
|
Merge pull request #11160 from Hatterhat/chem-combat-sucked-anyway
a mouth cover check for pies
|
2020-02-20 11:00:00 +01:00 |
|
TrilbySpaceClone
|
5401796a5f
|
corrections
|
2020-02-20 02:40:34 -05:00 |
|
kevinz000
|
d7403b3436
|
john doe
|
2020-02-19 22:26:10 -07:00 |
|
kevinz000
|
2dd5a0cfb8
|
Merge branch 'master' into hijack
|
2020-02-19 22:25:31 -07:00 |
|
Hatterhat
|
b5e369aaf1
|
i forgot about that one
|
2020-02-19 21:00:31 -06:00 |
|
Hatterhat
|
2d32c47743
|
so i forgot to change that over
|
2020-02-19 20:59:02 -06:00 |
|
kevinz000
|
a06fcea985
|
Merge remote-tracking branch 'citadel/master' into vampire_haste
|
2020-02-19 19:16:58 -07:00 |
|