727aa6b2a9
Merge pull request #7265 from Citadel-Station-13/upstream-merge-38745
...
[MIRROR] Fixes not receiving AI destroy objective during IAA
2018-07-01 09:32:39 -05:00
16eefdd1e6
Merge pull request #7264 from Citadel-Station-13/upstream-merge-38646
...
[MIRROR] [Ready]Expands the list of borg-wearable hats
2018-07-01 09:32:08 -05:00
18b8aad8cb
Merge pull request #7262 from Citadel-Station-13/upstream-merge-38690
...
[MIRROR] Destructive analyzers can now destroy anything again, even if it has no materials
2018-07-01 09:31:12 -05:00
7100ae3a7b
Merge pull request #7259 from Citadel-Station-13/upstream-merge-38727
...
[MIRROR] Prevents reagents being transferred to a bucket while its worn on a head
2018-07-01 09:30:46 -05:00
74730261b0
Merge pull request #7258 from Citadel-Station-13/upstream-merge-38689
...
[MIRROR] Move throwforce up to atom/movable
2018-07-01 09:30:09 -05:00
de6ae20f87
Merge pull request #7254 from Citadel-Station-13/upstream-merge-38644
...
[MIRROR] Port AI static to vis_contents
2018-07-01 09:29:10 -05:00
fe0c43fea2
Merge pull request #7252 from Citadel-Station-13/upstream-merge-38708
...
[MIRROR] Fix runtimes when energy guns are deleted
2018-07-01 09:28:20 -05:00
35b2338181
Merge pull request #7251 from Citadel-Station-13/upstream-merge-38709
...
[MIRROR] Fix being unable to export mechs
2018-07-01 09:28:03 -05:00
cd842fc20f
Merge pull request #7250 from Citadel-Station-13/upstream-merge-38702
...
[MIRROR] Remove unused and probably misbehaving admin human manifest spawner
2018-07-01 09:27:45 -05:00
e54ed36415
Merge pull request #7249 from Citadel-Station-13/upstream-merge-38699
...
[MIRROR] Hardsuit helmets protect eyes from pepperspray
2018-07-01 09:27:07 -05:00
b2fb67c607
Merge pull request #7248 from Citadel-Station-13/upstream-merge-38683
...
[MIRROR] Fixes anomaly area selection.
2018-07-01 09:26:38 -05:00
fb64d5ce71
Merge pull request #7247 from Citadel-Station-13/upstream-merge-38672
...
[MIRROR] Fix the MOTD having too many newlines
2018-07-01 09:26:04 -05:00
3dfeb02512
Merge pull request #7245 from Citadel-Station-13/upstream-merge-38697
...
[MIRROR] Improves machine overload logging
2018-07-01 09:25:40 -05:00
8e21d77c4d
Merge pull request #7244 from Citadel-Station-13/upstream-merge-38696
...
[MIRROR] fixes a cult message.fixes a cult message.
2018-07-01 09:25:21 -05:00
605f7a1bf6
Merge pull request #7240 from Citadel-Station-13/upstream-merge-38675
...
[MIRROR] Fixed cyborgs not getting their names at round start
2018-07-01 09:24:46 -05:00
4bbb592e12
Fixes IAA AI destroy objectives ( #38745 )
2018-06-26 17:02:24 -05:00
673ad79a32
[Ready]Expands the list of borg-wearable hats ( #38646 )
...
* Adds the ability to deconstruct empty cyborg shells.
* Update robot_parts.dm
* Update robot.dm
* Update robot.dm
* Update robot.dm
* Update robot_defense.dm
* Update _masks.dm
* Update robot_parts.dm
* Update robot_defense.dm
* replaced type with istype
* Reverting masks.dm
* Removing special snowflake bandana check.
* Update robot_defense.dm
* Added Captain's Crown
By player request.
2018-06-26 15:54:54 -05:00
ef851d5744
Destructive analyzers can now destroy anything again, even if it has no materials ( #38690 )
...
* Update rdconsole.dm
* Update destructive_analyzer.dm
2018-06-26 15:42:16 -05:00
feb01437d6
Prevents reagents being transferred to a bucket while its worn on a head ( #38727 )
...
* Fixed bucket hat bug
Stopped the user from pouring reagents into a bucket while worn as a hat. Does so by changing the bucket to not have a container type until its removed
* Should work
* Works better
* ExcessiveUseOfCobblestone is right, this better
* As per recommendation
2018-06-26 15:33:30 -05:00
83a4003660
Move throwforce up to atom/movable ( #38689 )
2018-06-26 15:27:09 -05:00
e2234a7fc4
Merge pull request #7149 from Citadel-Station-13/upstream-merge-30862
...
Flashbangs no longer hurt blobs
2018-06-26 14:07:53 -04:00
792943f683
Merge pull request #7034 from Trilbyspaceclone/patch-1
...
Adds in Oxygen to grass
2018-06-26 14:02:39 -04:00
a14bc0615d
Merge pull request #38644 from AutomaticFrenzy/patch/cameranet
...
Port AI static to vis_contents
2018-06-25 20:23:32 -05:00
e244438443
[MIRROR] Prevents tourettes from stacking ( #7253 )
...
* fixes tourettes being cancer (#38682 )
Prevents tourettes from stacking
* Prevents tourettes from stacking
2018-06-25 18:21:17 -07:00
463945ec76
Merge pull request #38708 from AutomaticFrenzy/patch/energy-gun
...
Fix runtimes when energy guns are deleted
2018-06-25 14:12:31 -05:00
c86a8ce23e
Merge pull request #38709 from AutomaticFrenzy/patch/export-mechs
...
Fix being unable to export mechs
2018-06-25 14:12:24 -05:00
ac300966f5
Merge pull request #38702 from vuonojenmustaturska/cleanup
...
Remove unused and probably misbehaving admin human manifest spawner
2018-06-25 10:34:57 -05:00
4baee89615
Merge pull request #38699 from Irafas/HardsuitEyeFix
...
Hardsuit helmets protect eyes from pepperspray
2018-06-25 09:19:58 -05:00
888b04427c
Merge pull request #38683 from AnturK/anomalyfix
...
Fixes anomaly area selection.
2018-06-25 09:18:40 -05:00
1c41c36489
Merge pull request #38672 from AutomaticFrenzy/patch/goonchat-motd
...
Fix the MOTD having too many newlines
2018-06-25 09:18:27 -05:00
6579450176
Merge pull request #38697 from DaxDupont/a
...
Improves machine overload logging
2018-06-25 09:15:25 -05:00
c97abeaf09
Merge pull request #38696 from Tlaltecuhtli/patch-53
...
fixes a cult message.fixes a cult message.
2018-06-25 09:15:17 -05:00
bae1993861
Update pipe_dispenser.dm
2018-06-25 06:19:30 -07:00
cdd285f5c7
Update job.dm
2018-06-24 23:30:28 -05:00
d79b85d719
trims a few issues during mirror merges
2018-06-24 18:42:24 -05:00
acd10b02cf
Merge pull request #7195 from Citadel-Station-13/upstream-merge-38574
...
[MIRROR] Global component signals
2018-06-24 18:20:17 -05:00
91d40042a4
Merge pull request #7181 from Citadel-Station-13/upstream-merge-38557
...
[MIRROR] Fix some shuttle chair stuff
2018-06-24 18:19:18 -05:00
629ecaa2c0
Merge pull request #7238 from Citadel-Station-13/upstream-merge-38684
...
[MIRROR] Allow actually saving Goonchat logs
2018-06-24 18:18:15 -05:00
58b6671302
Merge pull request #7237 from Citadel-Station-13/upstream-merge-38692
...
[MIRROR] Blacklisted buggy build 1428
2018-06-24 18:17:54 -05:00
2665d0e7a9
Merge branch 'master' into upstream-merge-38661
2018-06-24 18:13:53 -05:00
72bc5121bd
Merge pull request #7233 from Citadel-Station-13/upstream-merge-38653
...
[MIRROR] Ports more things to Initialize
2018-06-24 18:12:40 -05:00
7a473cf8c6
Merge pull request #7231 from Citadel-Station-13/upstream-merge-38668
...
[MIRROR] Fixes being able to transfer from closed containers to open ones
2018-06-24 18:11:18 -05:00
e0eac87b81
Merge pull request #7230 from Citadel-Station-13/upstream-merge-38617
...
[MIRROR] Cyborgs now drop radio keys on detonation/destruction
2018-06-24 16:40:44 -05:00
5212877dfc
Merge pull request #7229 from Citadel-Station-13/upstream-merge-38658
...
[MIRROR] Fixes antag logs
2018-06-24 16:40:35 -05:00
4177d3664b
Merge pull request #7224 from Citadel-Station-13/upstream-merge-38650
...
[MIRROR] Removes unused undefs
2018-06-24 16:40:09 -05:00
6accc4e690
Merge pull request #7222 from Citadel-Station-13/upstream-merge-38306
...
[MIRROR] Bubblegum is scarier again
2018-06-24 16:37:49 -05:00
269a375927
Merge pull request #7221 from Citadel-Station-13/upstream-merge-38321
...
[MIRROR] [READY] better contraband crates
2018-06-24 15:33:05 -05:00
057350d7dc
Merge pull request #7220 from Citadel-Station-13/upstream-merge-38093
...
[MIRROR] Fixes and adds blast cannons to traitor science uplink items
2018-06-24 15:32:49 -05:00
2b1d86629a
Merge pull request #7219 from Citadel-Station-13/upstream-merge-38637
...
[MIRROR] Makes create antags check for on station.
2018-06-24 15:22:00 -05:00
0c9ce40871
Merge pull request #7218 from Citadel-Station-13/upstream-merge-38633
...
[MIRROR] potency gene disks now clarify what the % means on examine
2018-06-24 15:16:51 -05:00
LetterJay