silicons
08f905f5bc
Update portable_turret_construct.dm
2020-07-23 18:52:27 -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
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
Sneakyrat6
402f13ce1b
Fixes dressers not giving you undies
2020-07-21 20:33:58 -05: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
dec84af233
Merge pull request #12830 from Funce/genetic-spider-fix
...
Fixes genewebs being impossibly impassable
2020-07-20 10:49:10 -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
Timothy Teakettle
1b99cb9201
everything has the bonesetter
2020-07-19 18:32:44 +01:00
Timothy Teakettle
a8d2f558bc
use old table pushing
2020-07-19 17:53:25 +01:00
Timothy Teakettle
ca6b289da6
fix tables and some minor thing
2020-07-19 17:49:22 +01:00
Lin
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
silicons
5b408d5b33
Update space.dm
2020-07-18 20:52:15 -07:00
silicons
9b1aa39497
Update space.dm
2020-07-18 20:51:30 -07:00
silicons
53dd4fc857
Update areas.dm
2020-07-18 20:50:28 -07:00
Winter Flare
2effbf4db0
Fixes Spiral, and Cracker Box
2020-07-18 18:53:47 -04:00
Timothy Teakettle
1a5008fee7
Merge branch 'master' into wound-port
2020-07-18 23:06:49 +01:00
Lin
ba3dc6a73b
Merge pull request #12679 from silicons/unarmed_parry
...
Ok ok hear me out: Implements unarmed parry.
2020-07-18 17:02:02 -05:00
Timothy Teakettle
3b78ac58bd
make it clearer
2020-07-18 22:46:07 +01:00
Timothy Teakettle
f290050a78
Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port
2020-07-18 22:02:24 +01:00
Timothy Teakettle
de83bbee0b
woops
2020-07-18 22:02:07 +01:00
Timothy Teakettle
974b80a2fd
Merge branch 'master' into wound-port
2020-07-18 21:45:24 +01:00
kappa-sama
c39a517519
nerf this
2020-07-18 03:47:31 -04:00
BlackMajor
4635f8aefb
fixes not being able to pick up chem/bio bags
2020-07-18 19:34:11 +12:00
lolman360
f696a461af
Update RSF.dm
2020-07-18 16:10:25 +10:00
lolman360
0e38e1ff39
e
2020-07-18 16:03:32 +10:00
BlackMajor
68475fe301
Forgot to let borgs use the iv drip
2020-07-18 17:39:41 +12:00
BlackMajor
f68962e9d3
This is a bad idea
2020-07-18 16:46:08 +12:00
timothyteakettle
e8fade4f7f
changes
2020-07-18 02:29:12 +01:00
CameronWoof
431c52b7e2
Merge remote-tracking branch 'upstream/master' into advanced-sutures-and-mesh
2020-07-17 17:22:43 -07:00
silicons
a8e2b84ad8
Merge pull request #12763 from zeroisthebiggay/b
...
hopefully fixes records possibly
2020-07-17 17:10:40 -07:00
silicons
044525519a
Merge pull request #12750 from timothyteakettle/loadout-plushies
...
replaces plushies in the loadout menu with a choice box
2020-07-17 17:10:14 -07:00
silicons
655afda020
Merge pull request #12780 from BlackMajor/borgo
...
Even more engiborg power creep
2020-07-17 17:08:23 -07:00
silicons
3d5c77f62b
Merge pull request #12779 from b1tt3r1n0/circlegame
...
Circle Game, Updated
2020-07-17 17:08:06 -07:00
silicons
04df84d1e0
Merge pull request #12776 from timothyteakettle/snail-shells
...
snail shell backpack
2020-07-17 17:07:46 -07:00
