Commit Graph

12533 Commits

Author SHA1 Message Date
TerraGS
2d3969882a Updates plastic flaps icon and cleans up its code (#38751)
cl
imageadd: New icon for plastic flaps that actually looks airtight.
code: Update to plastic flaps code to use tool procs rather than attackby and removed two pointless states.
/cl

Gives plastic flaps an airtight look to fit their new property. Removes two defines that were just a functional copy of anchored. Replaces calls to attackby() with screwdriver_act() and wirecutter_act().
2018-07-01 05:43:01 -05:00
ShizCalev
b523a59ae5 Fixes PDA ID teleporting (#38795) 2018-07-01 05:42:40 -05:00
XDTM
1a56d8243e Potentially fixes monkey fever runtiming on infection (#38776) 2018-07-01 05:42:07 -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
kevinz000
8b1917f149 Update bag_of_holding.dm 2018-06-27 01:38:36 -07: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
kevinz000
2f77e5894c Update research.dm 2018-06-26 16:39:22 -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
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
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
CitadelStationBot
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
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
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
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
kevinz000
bae1993861 Update pipe_dispenser.dm 2018-06-25 06:19:30 -07:00
LetterJay
cdd285f5c7 Update job.dm 2018-06-24 23:30:28 -05:00
LetterJay
d79b85d719 trims a few issues during mirror merges 2018-06-24 18:42:24 -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
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
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
5212877dfc Merge pull request #7229 from Citadel-Station-13/upstream-merge-38658
[MIRROR] Fixes antag logs
2018-06-24 16:40:35 -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