db24df58a0
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:36:46 -07:00
9f66163d4f
Merge pull request #12828 from Owai-Seek/foodport-p2-7/12/20
...
Ports several food sprites/foods from Baystation/Citadel RP
2020-07-23 10:35:30 -07:00
ec72015f4f
Merge pull request #12809 from BlackMajor/borgo
...
Gripper brained. The medborg can do chemistry now, oh no.
2020-07-23 10:35:16 -07:00
11a4dfd20b
Merge pull request #12861 from Sneakyrat6/dresserFix
...
Fixes dressers not giving you undies
2020-07-23 10:28:54 -07:00
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
38a9e89687
ok bet
2020-07-23 09:49:56 -07:00
0858af4b85
ok
2020-07-23 09:43:43 -07:00
703afec454
ok
2020-07-23 08:57:15 -07:00
6d4f5c633b
Update clown_ops.dm
2020-07-21 22:13:58 -07:00
d5a6a3ecd9
actual code chang
2020-07-22 12:02:31 +08:00
17d1fd0692
fixes
2020-07-22 12:42:46 +10:00
402f13ce1b
Fixes dressers not giving you undies
2020-07-21 20:33:58 -05:00
c07e5d544b
wweeee
2020-07-22 11:27:26 +10:00
661b9920fc
luh mayo
2020-07-22 10:59:21 +10:00
0f1aa3c0ca
'lolman? did you test your code?'
...
no i did not ms. kevinz
2020-07-22 10:49:56 +10:00
184e3992f3
fixes
2020-07-21 11:56:23 -07:00
4d48abf3a6
fixes
2020-07-21 11:46:17 -07:00
f3efa19436
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-21 11:25:26 -07:00
1450b11b01
sigh
2020-07-20 21:37:44 -07:00
75a2035774
Merge branch 'master' into wound-port
2020-07-21 01:10:51 +01:00
3d2995b4e8
Merge pull request #12787 from CameronWoof/advanced-sutures-and-mesh
...
Ports Medicated Sutures and Advanced Regenerative Mesh from TG
2020-07-20 17:01:32 -07:00
7df369e5d7
Merge pull request #12811 from kappa-sama/patch-33
...
removes the 2 best weapons in the game from traitor uplink's 10tc surgery bag
2020-07-20 16:58:01 -07:00
9bb92f8d4d
Merge pull request #12805 from SiliconMain/patch-1
...
This is stupid
2020-07-20 16:56:57 -07:00
947b050c47
Merge pull request #12804 from Arturlang/decal_painter_fix
...
Decal Painter ui fix
2020-07-20 16:55:38 -07:00
210b7b281c
Merge pull request #12727 from Citadel-Station-13/silicons-patch-19
...
bandaids around turnstiles being bad code until it can have its movement checks refactored
2020-07-20 18:25:01 -05:00
7adae61ade
Merge pull request #12773 from Citadel-Station-13/silicons-patch-28
...
jexp exemption now also exempts from antag days remaining locks
2020-07-20 18:22:42 -05:00
923b4cbb4f
Merge pull request #12823 from Citadel-Station-13/gravity_update
...
gravity now immediately updates on entering/exiting areas with different gravity and space meaning no more slow for 4 seconds while in a hardsuit and then fast with jetpack
2020-07-20 18:21:55 -05:00
67a6330e77
Merge pull request #12786 from silicons/survivalists
...
makes survivalists pseudoantags again and limits summon guns/magic to one use
2020-07-20 18:20:08 -05:00
267186a5d3
Merge pull request #12646 from Chiirno/emi
...
[READY] Alt-click cigarette pack functionality added to pill bottles.
2020-07-20 16:15:38 -07:00
692656b02d
Whew
2020-07-20 11:53:33 -07:00
526d257410
fix
2020-07-20 11:48:08 -07:00
416b989e12
changes
2020-07-20 11:35:10 -07:00
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
d43a5cae26
let's refactor attack_hand.
2020-07-20 11:19:20 -07:00
dec84af233
Merge pull request #12830 from Funce/genetic-spider-fix
...
Fixes genewebs being impossibly impassable
2020-07-20 10:49:10 -07:00
58e26c540c
merge from master
2020-07-20 10:18:44 -07:00
64d5bd0030
switches around messages
2020-07-19 21:38:44 -03:00
0c07faa3e0
For future reference, '.' return overrides 'return' statements
2020-07-20 12:22:18 +12:00
2af449a3c7
Fixes genewebs being impossibly impassable
2020-07-20 11:55:23 +12:00
f265b85d3b
Merge pull request #12810 from lolman360/master
...
service borg fix/tweak
2020-07-20 11:42:59 +12:00
e416a2377e
Merge branch 'master' into foodport-p2-7/12/20
2020-07-19 18:58:52 -04:00
1b99cb9201
everything has the bonesetter
2020-07-19 18:32:44 +01:00
a8d2f558bc
use old table pushing
2020-07-19 17:53:25 +01:00
ca6b289da6
fix tables and some minor thing
2020-07-19 17:49:22 +01:00
b47872c079
Merge pull request #12802 from Citadel-Station-13/silicons-patch-31
...
fixes eshields not reflecting while active blocking uh oh
2020-07-19 11:12:32 -05:00
5b408d5b33
Update space.dm
2020-07-18 20:52:15 -07:00
9b1aa39497
Update space.dm
2020-07-18 20:51:30 -07:00
53dd4fc857
Update areas.dm
2020-07-18 20:50:28 -07:00
55f8e37544
sigh
2020-07-18 20:26:11 -07:00
910869d6bf
more
2020-07-18 19:44:12 -07:00
silicons