Commit Graph

6761 Commits

Author SHA1 Message Date
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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
ShizCalev 6c89362f60 Fixes emitter runtime (#38796)
fire() was already handled at 199-204
2018-07-01 05:44:10 -05:00
ShizCalev 6814022a1b Fixes arrivals shuttle damage message runtime (#38779) 2018-07-01 05:43:51 -05:00
Dennok 58f634db63 deconstructable-TEG (#38656)
Make TEG deconstructable.
2018-07-01 05:41:53 -05:00
Matt Smith 17d59060ad Add welded shut message to vent scrubber (#38834) 2018-07-01 05:41:43 -05:00
AnturK 18dd26ee3a Adds missing armor to accessories (#38800) 2018-07-01 05:41:32 -05:00
Thunder12345 8c58a28a60 Adds a colour picker component for circuits (#38804)
* added color picker IC component

* added sprite for color picker
2018-07-01 05:40:43 -05:00
81Denton f244ec31a0 Gives honey antibiotic properties (#38728)
* Gives honey antibiotic properties
henk

* 0.6
2018-06-26 20:30:41 -05:00
kevinz000 8c71bbe36b Update ark_of_the_clockwork_justicar.dm 2018-06-26 17:44:11 -07:00
kevinz000 4bddef70e2 Update ark_of_the_clockwork_justicar.dm 2018-06-26 17:43:52 -07:00
kevinz000 8975695b54 Update ratvar_the_clockwork_justicar.dm 2018-06-26 17:43:19 -07:00
kevinz000 df68eb864a Update ratvar_the_clockwork_justicar.dm 2018-06-26 17:39:59 -07:00
Nich 4bbb592e12 Fixes IAA AI destroy objectives (#38745) 2018-06-26 17:02:24 -05:00
zxaber 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
kevinz000 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
Irafas 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
Tad Hardesty 83a4003660 Move throwforce up to atom/movable (#38689) 2018-06-26 15:27:09 -05:00
deathride58 792943f683 Merge pull request #7034 from Trilbyspaceclone/patch-1
Adds in Oxygen to grass
2018-06-26 14:02:39 -04:00
Jordan Brown a14bc0615d Merge pull request #38644 from AutomaticFrenzy/patch/cameranet
Port AI static to vis_contents
2018-06-25 20:23:32 -05:00
Jordan Brown 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
Jordan Brown c86a8ce23e Merge pull request #38709 from AutomaticFrenzy/patch/export-mechs
Fix being unable to export mechs
2018-06-25 14:12:24 -05:00
Jordan Brown 4baee89615 Merge pull request #38699 from Irafas/HardsuitEyeFix
Hardsuit helmets protect eyes from pepperspray
2018-06-25 09:19:58 -05:00
Jordan Brown 888b04427c Merge pull request #38683 from AnturK/anomalyfix
Fixes anomaly area selection.
2018-06-25 09:18:40 -05:00
Jordan Brown 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
Jordan Brown 6579450176 Merge pull request #38697 from DaxDupont/a
Improves machine overload logging
2018-06-25 09:15:25 -05:00
Jordan Brown 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
LetterJay acd10b02cf Merge pull request #7195 from Citadel-Station-13/upstream-merge-38574
[MIRROR] Global component signals
2018-06-24 18:20:17 -05:00
LetterJay 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
LetterJay 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
LetterJay 2665d0e7a9 Merge branch 'master' into upstream-merge-38661 2018-06-24 18:13:53 -05:00
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 4177d3664b Merge pull request #7224 from Citadel-Station-13/upstream-merge-38650
[MIRROR] Removes unused undefs
2018-06-24 16:40:09 -05:00
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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 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
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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