f54854bca8
Updates test areas debug command ( #34074 )
...
* Sanity check for test areas debug command
* Shifted to popup window
2018-01-08 04:39:09 -06:00
39614f685e
Merge pull request #4712 from Citadel-Station-13/upstream-merge-34100
...
[MIRROR] Adds spaceturf check to blob overmind spawning
2018-01-08 06:17:23 +00:00
c2eed848dd
Merge pull request #4696 from Citadel-Station-13/upstream-merge-34150
...
[MIRROR] Ridden vehicles now move mobs post-buckle via the buckle_mob proc instead of pre, fixing lavaboats setting people on fire
2018-01-08 04:42:28 +00:00
c977193db0
Merge pull request #4715 from Citadel-Station-13/upstream-merge-34058
...
[MIRROR] Fixes component forensics deleting old instead of new component.
2018-01-08 04:20:43 +00:00
6b27e322b8
Merge pull request #4714 from Citadel-Station-13/upstream-merge-34125
...
[MIRROR] Makes the chaplain's soulshard require death
2018-01-08 04:19:45 +00:00
9decb2e2b2
Update overmind.dm
2018-01-07 23:18:28 -05:00
406df3ae92
Merge pull request #4709 from Citadel-Station-13/upstream-merge-34076
...
[MIRROR] Fixes diagonal movement in pipes
2018-01-08 04:18:06 +00:00
432fdfc0d3
Merge pull request #4711 from Citadel-Station-13/upstream-merge-34097
...
[MIRROR] Fixes can_cast short circuit
2018-01-08 04:17:42 +00:00
984bf470d5
Merge pull request #4710 from Citadel-Station-13/upstream-merge-34093
...
[MIRROR] fixes some grinder recipes
2018-01-08 04:17:29 +00:00
c0d2fe8817
Merge pull request #4707 from Citadel-Station-13/upstream-merge-33979
...
[MIRROR] Implements the Ballmer Peak: Now the bartender can help R&D!
2018-01-08 04:16:38 +00:00
91531525ca
Merge pull request #4706 from Citadel-Station-13/upstream-merge-33971
...
[MIRROR] Newly crafted stacks are merged with held stacks of the same type
2018-01-08 04:16:01 +00:00
57d8457108
Merge pull request #4705 from Citadel-Station-13/upstream-merge-33645
...
[MIRROR] Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog
2018-01-08 04:15:47 +00:00
ba909ce9a2
Merge pull request #4704 from Citadel-Station-13/upstream-merge-34128
...
[MIRROR] Removes the safe dial multiplier
2018-01-08 04:15:12 +00:00
d11604e502
Merge pull request #4703 from Citadel-Station-13/upstream-merge-34129
...
[MIRROR] Adds package wrapping to autolathes
2018-01-08 04:14:52 +00:00
da3d982ed6
Merge pull request #4701 from Citadel-Station-13/upstream-merge-34118
...
[MIRROR] Reduces the memory footprint of the gas_mixture datum
2018-01-08 04:14:22 +00:00
b18d720730
Merge pull request #4700 from Citadel-Station-13/upstream-merge-34119
...
[MIRROR] Fixes uplink_purchase_log GC error
2018-01-08 04:14:04 +00:00
d1d2ed1139
Merge pull request #4699 from Citadel-Station-13/upstream-merge-34157
...
[MIRROR] Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason
2018-01-08 04:13:47 +00:00
94b664f934
Update ridden.dm
2018-01-07 23:10:44 -05:00
cbe0a9a05d
Fixes component forensics deleting old instead of new component. ( #34058 )
...
* component dupe unique
* sorry I was using webeditor on phone and it wouldn't let me tab
2018-01-07 21:50:23 -06:00
d057f55ed4
Makes the chaplain's soulshard require death ( #34125 )
2018-01-07 20:56:24 -06:00
02b63e199b
Adds spaceturf check to blob overmind spawning
2018-01-07 20:52:01 -06:00
af27a1aa03
Fixes can_cast short circuit ( #34097 )
2018-01-07 20:49:50 -06:00
7aa8bf9b69
fixes some grinder recipes ( #34093 )
...
* commit
help what is this
* ddd
* sdsadsda
* fegdhfd
* ddddddddddddddd
2018-01-07 20:36:29 -06:00
65afc4d2b2
fixes diagonal movement in pipes ( #34076 )
2018-01-07 20:34:18 -06:00
99b299a1eb
Implements the Ballmer Peak: Now the bartender can help R&D! ( #33979 )
...
* Implements the Ballmer Peak: Now the bartender can help R&D!
* fugg
* lmao forgot to multiply that
* unzips math
* asdaafffff
* buffs windows ME
* Adds notifications about the peak.
2018-01-07 20:30:57 -06:00
6720fc3713
Newly crafted stacks are merged with held stacks of the same type ( #33971 )
...
* Merge newly crafted stacks with held stacks
* Update code
2018-01-07 20:28:46 -06:00
c3712f5be5
Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog ( #33645 )
...
* Objects touched by servants now warp to the Ark
* Check by servant
* Replaces with a baselock
* Updates the 'log
2018-01-07 20:18:28 -06:00
bc636ddb2c
Merge pull request #34128 from ShizCalev/safe-dial
...
Removes the safe dial multiplier
2018-01-07 20:08:11 -06:00
f9f6bae65d
Merge pull request #34129 from MrDoomBringer/eminem
...
Adds package wrapping to autolathes
2018-01-07 20:07:00 -06:00
1e4a6dd26b
Merge pull request #34118 from MrStonedOne/patch-459
...
Reduces the memory footprint of the gas_mixture datum
2018-01-07 19:58:35 -06:00
1e2e8b7ecb
Fixes uplink_purchase_log GC error ( #34119 )
...
* Fixes uplink_purchase_log GC error
* Add missing GLOB.
2018-01-07 18:52:26 -06:00
ff80771081
Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason ( #34157 )
...
* Fixes dchat broadcast
* Update communications.dm
2018-01-07 18:51:16 -06:00
801eab4c3c
Fixes decals being created on bad turfs ( #34121 )
...
* Fixes decals being created on bad turfs
* Fix decal check
* squash me daddy
2018-01-07 18:51:09 -06:00
604712db33
Ridden vehicles now move mobs post-buckle via the buckle_mob proc instead of pre, fixing lavaboats setting people on fire
2018-01-07 18:49:49 -06:00
1944c08a7b
Merge pull request #4692 from Citadel-Station-13/upstream-merge-34140
...
[MIRROR] Fixes armor penetration not working on objects and therefore mechs
2018-01-07 20:39:29 +00:00
57d79640f4
Merge pull request #4691 from Citadel-Station-13/upstream-merge-34134
...
[MIRROR] Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp
2018-01-07 20:30:06 +00:00
cc0cb03046
Merge pull request #4693 from Citadel-Station-13/upstream-merge-34127
...
[MIRROR] Removes the weird timer shennaigans from exp tracking
2018-01-07 20:21:47 +00:00
7f19b55888
Merge pull request #4689 from Citadel-Station-13/upstream-merge-34131
...
[MIRROR] Fixes sunglasses' incorrect description
2018-01-07 20:21:31 +00:00
7f53f7dc08
Update projectile.dm
2018-01-07 15:20:59 -05:00
dd5dc57043
Update blood.dm
2018-01-07 15:20:11 -05:00
d5a54402cf
Merge pull request #34127 from tgstation/Cyberboss-patch-7
...
Removes the weird timer shennaigans from exp tracking
2018-01-07 11:06:14 -06:00
be1fe799db
Fixes armor penetration not working on objects and therefore mechs
2018-01-07 11:03:59 -06:00
7956e3df27
Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp
2018-01-07 11:02:49 -06:00
c2851e7837
priority:critical
2018-01-07 02:08:51 -06:00
f13426c5af
many flashes??
2018-01-07 02:07:39 -06:00
277320b126
Merge pull request #4685 from Citadel-Station-13/upstream-merge-34114
...
[MIRROR] Fixes some antags missing from roundend report
2018-01-06 20:30:02 +00:00
8c448b0d52
Merge pull request #4686 from Citadel-Station-13/upstream-merge-34116
...
[MIRROR] Adds ban option for team antags
2018-01-06 10:23:17 -06:00
f36b07371f
Update datum_traitor.dm
2018-01-06 10:23:08 -06:00
8f8e16ba12
Adds ban option for team antags ( #34116 )
...
* adds ban option for team antags
* conversion antags ban button
2018-01-06 08:52:31 -06:00
0638dabfd2
Fixes some antags missing from roundend report
2018-01-06 08:51:51 -06:00
ShizCalev