silicons
791bfabc9b
walls
2020-07-26 16:03:57 -07:00
silicons
7d7f40ce90
fixes
2020-07-26 14:56:03 -07:00
silicons
94e218ccc0
ok
2020-07-26 01:04:55 -07:00
silicons
d3e808f0e1
fix
2020-07-26 00:18:42 -07:00
silicons
1990f75957
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-25 23:46:27 -07:00
silicons
2a29f73ac8
ok
2020-07-25 17:34:12 -07:00
silicons
91081ef24c
Merge pull request #12872 from Iatots/hairball
...
Adds depth to the lick wounds mechanic.
2020-07-25 15:40:15 -07:00
silicons
0e1574bf77
sigh
2020-07-24 23:34:47 -07:00
Iatots
b6437a4ada
Update code/game/objects/items/plushes.dm
...
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
2020-07-24 15:23:11 +02:00
Iatots
ec2bd9b876
Update plushes.dm
2020-07-24 08:40:25 +02:00
silicons
64de8f16a9
fixes
2020-07-23 16:59:27 -07:00
silicons
9c9014acdb
crate fix
2020-07-23 16:19:07 -07:00
Lin
8a25582c1c
Merge pull request #12850 from silicons/drag
...
fixes dragging stuff into space, enforces no sleeping on Life() and sets Move() to forced async
2020-07-23 17:13:48 -05:00
Iatots
b2a0d00eee
Update plushes.dm
2020-07-23 21:13:41 +02:00
silicons
cd67be32e0
Update wishgranter.dm
2020-07-23 11:12:09 -07:00
Iatots
80f2766314
Update plushes.dm
2020-07-23 20:11:29 +02:00
silicons
db24df58a0
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:36:46 -07:00
silicons
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
silicons
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
silicons
11a4dfd20b
Merge pull request #12861 from Sneakyrat6/dresserFix
...
Fixes dressers not giving you undies
2020-07-23 10:28:54 -07:00
silicons
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
silicons
38a9e89687
ok bet
2020-07-23 09:49:56 -07:00
silicons
0858af4b85
ok
2020-07-23 09:43:43 -07:00
silicons
703afec454
ok
2020-07-23 08:57:15 -07:00
Sneakyrat6
402f13ce1b
Fixes dressers not giving you undies
2020-07-21 20:33:58 -05:00
silicons
184e3992f3
fixes
2020-07-21 11:56:23 -07:00
silicons
4d48abf3a6
fixes
2020-07-21 11:46:17 -07:00
silicons
1450b11b01
sigh
2020-07-20 21:37:44 -07:00
Timothy Teakettle
75a2035774
Merge branch 'master' into wound-port
2020-07-21 01:10:51 +01:00
silicons
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
silicons
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
silicons
9bb92f8d4d
Merge pull request #12805 from SiliconMain/patch-1
...
This is stupid
2020-07-20 16:56:57 -07:00
silicons
947b050c47
Merge pull request #12804 from Arturlang/decal_painter_fix
...
Decal Painter ui fix
2020-07-20 16:55:38 -07:00
Lin
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
Lin
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
Lin
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
Lin
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
silicons
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
silicons
692656b02d
Whew
2020-07-20 11:53:33 -07:00
silicons
526d257410
fix
2020-07-20 11:48:08 -07:00
silicons
416b989e12
changes
2020-07-20 11:35:10 -07:00
silicons
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
silicons
d43a5cae26
let's refactor attack_hand.
2020-07-20 11:19:20 -07:00
silicons
dec84af233
Merge pull request #12830 from Funce/genetic-spider-fix
...
Fixes genewebs being impossibly impassable
2020-07-20 10:49:10 -07:00
silicons
58e26c540c
merge from master
2020-07-20 10:18:44 -07:00
Chiirno
64d5bd0030
switches around messages
2020-07-19 21:38:44 -03:00
Funce
0c07faa3e0
For future reference, '.' return overrides 'return' statements
2020-07-20 12:22:18 +12:00
Funce
2af449a3c7
Fixes genewebs being impossibly impassable
2020-07-20 11:55:23 +12:00
BlackMajor
f265b85d3b
Merge pull request #12810 from lolman360/master
...
service borg fix/tweak
2020-07-20 11:42:59 +12:00
Winter Flare
e416a2377e
Merge branch 'master' into foodport-p2-7/12/20
2020-07-19 18:58:52 -04:00
