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
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
83a4003660
Move throwforce up to atom/movable ( #38689 )
2018-06-26 15:27:09 -05: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
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
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
acd10b02cf
Merge pull request #7195 from Citadel-Station-13/upstream-merge-38574
...
[MIRROR] Global component signals
2018-06-24 18:20:17 -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
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
0a28cbdfc4
Merge pull request #7217 from Citadel-Station-13/upstream-merge-38570
...
[MIRROR] Fixes gulag stacker not giving points after RPG loot event
2018-06-24 15:16:35 -05:00
7e84223efd
Merge pull request #7202 from Citadel-Station-13/upstream-merge-38605
...
[MIRROR] Micro-optimization to update_corners()
2018-06-24 15:12:05 -05:00
701f2fde31
Merge pull request #7201 from Citadel-Station-13/upstream-merge-38153
...
[MIRROR] Equalizes Roundstart Mining Options (Removes some Advanced Scanners and Explorer Webbings)
2018-06-24 15:11:41 -05:00
ecbe355b4b
Merge pull request #7189 from Citadel-Station-13/upstream-merge-38580
...
[MIRROR] Adds a pink scarf
2018-06-24 15:07:34 -05:00
06c7cebb82
Merge pull request #7188 from Citadel-Station-13/upstream-merge-38319
...
[MIRROR] [READY] Helps data disks stop being unemployed
2018-06-24 15:07:14 -05:00
fc3ed3716d
Merge pull request #7187 from Citadel-Station-13/upstream-merge-38576
...
[MIRROR] Fixes alternative method of removing legcuffs.
2018-06-24 15:06:21 -05:00
d50ae43d7f
Fixed cyborgs not getting their names at round start
2018-06-24 13:55:03 -05:00
f1684aab2f
Merge pull request #38684 from AutomaticFrenzy/patch/goonchat-logs
...
Allow actually saving Goonchat logs
2018-06-24 09:44:31 -05:00
11dc633021
Merge pull request #38692 from Jordie0608/blacklistedmakesitsoundlikethebuilddidsomethingbadwhichitdidbadbuildnaughtybuild
...
Blacklisted buggy build 1428
2018-06-24 09:16:39 -05:00
20cb09cb1c
Fixes bubblegum comments
2018-06-24 05:17:22 -05:00
a73bfd0913
Ports more things to Initialize ( #38653 )
2018-06-24 05:17:15 -05:00
1a53b59b12
Fixes closed soda cans transferring ( #38668 )
2018-06-24 05:17:00 -05:00
4ffe025624
Cyborgs now drop radio keys on detonation/destruction ( #38617 )
...
* Cyborgs now drop radio keys on detonation/destruction
* Woops!
* Update robot.dm
* Use atom rather than turf
2018-06-24 05:16:18 -05:00
f02a99f901
[MIRROR] Fixes HE pipes not respecting layering ( #7223 )
...
* Fixes HE pipes not respecting layering (#38468 )
* HE pipes fix
* Heat exchange stuff
* Fixes HE pipes not respecting layering
2018-06-22 00:16:50 -07:00
6e94511718
Removes unused defines ( #38650 )
2018-06-22 02:04:45 -05:00
fa06a729a2
Bubblegum is scarier again ( #38306 )
...
Miners are able to kill him roundstart by just walking backwards while shooting. Weaker than an ash drake.
Easiest way to change this was to give him his original attacks back which required you to avoid/manage blood.
2018-06-21 18:56:28 -05:00
01eb1bc7fe
[READY] better contraband crates ( #38321 )
...
feature: NT reports that the local contraband market has expanded, experts say that the Syndicate is involved.
2018-06-21 18:52:15 -05:00
LetterJay