Commit Graph
11414 Commits
Author SHA1 Message Date
LetterJayandGitHub ee0bef443e Merge pull request #7283 from Citadel-Station-13/upstream-merge-38796
[MIRROR] Fixes emitter runtime
2018-07-01 09:39:43 -05:00
LetterJayandGitHub af5a250ce4 Merge pull request #7282 from Citadel-Station-13/upstream-merge-38779
[MIRROR] Fixes arrivals shuttle damage message runtime
2018-07-01 09:39:28 -05:00
LetterJayandGitHub 42c322ca2c Merge pull request #7281 from Citadel-Station-13/upstream-merge-38789
[MIRROR] Cleans up leftover telesci teleporter code
2018-07-01 09:39:08 -05:00
LetterJayandGitHub b5b8ce5337 Merge pull request #7280 from Citadel-Station-13/upstream-merge-38751
[MIRROR] Updates plastic flaps icon and cleans up its code
2018-07-01 09:38:16 -05:00
LetterJayandGitHub 2b9aca8143 Merge pull request #7279 from Citadel-Station-13/upstream-merge-38795
[MIRROR] [s] Fixes PDA ID teleporting
2018-07-01 09:37:45 -05:00
LetterJayandGitHub 2303e23f2c Merge pull request #7278 from Citadel-Station-13/upstream-merge-38776
[MIRROR] Potentially fixes monkey fever runtiming on infection
2018-07-01 09:37:24 -05:00
LetterJayandGitHub be23ad6a06 Merge pull request #7277 from Citadel-Station-13/upstream-merge-38656
[MIRROR] Makes the deconstructable TEG working
2018-07-01 09:36:57 -05:00
LetterJayandGitHub c7b830d2c6 Merge pull request #7276 from Citadel-Station-13/upstream-merge-38834
[MIRROR] Add welded shut message to vent scrubber
2018-07-01 09:36:33 -05:00
LetterJayandGitHub e1d6ee593b Merge pull request #7275 from Citadel-Station-13/upstream-merge-38800
[MIRROR] Adds missing armor to accessories
2018-07-01 09:36:13 -05:00
LetterJayandGitHub f7fef5f1ed Merge pull request #7273 from Citadel-Station-13/upstream-merge-38804
[MIRROR] Adds a colour picker component for circuits
2018-07-01 09:35:51 -05:00
LetterJayandGitHub 96fcd9275f Merge pull request #7268 from Citadel-Station-13/kevinz000-patch-9
boh fix mirror broke
2018-07-01 09:33:53 -05:00
LetterJayandGitHub 389faab2a5 Merge pull request #7267 from Citadel-Station-13/upstream-merge-38728
[MIRROR] Gives honey antibiotic properties
2018-07-01 09:33:36 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
ShizCalevandletterjay 8c410b92a7 Fixes TGUI runtime (#38797)
ui_interact was being called on usr instead of M
2018-07-01 05:44:17 -05:00
ShizCalevandletterjay 6c89362f60 Fixes emitter runtime (#38796)
fire() was already handled at 199-204
2018-07-01 05:44:10 -05:00
ShizCalevandletterjay 6814022a1b Fixes arrivals shuttle damage message runtime (#38779) 2018-07-01 05:43:51 -05:00
ShizCalevandletterjay 452b34caa2 Cleans up leftover telesci teleporter code (#38789) 2018-07-01 05:43:43 -05:00
TerraGSandletterjay 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
ShizCalevandletterjay b523a59ae5 Fixes PDA ID teleporting (#38795) 2018-07-01 05:42:40 -05:00
XDTMandletterjay 1a56d8243e Potentially fixes monkey fever runtiming on infection (#38776) 2018-07-01 05:42:07 -05:00
Dennokandletterjay 58f634db63 deconstructable-TEG (#38656)
Make TEG deconstructable.
2018-07-01 05:41:53 -05:00
Matt Smithandletterjay 17d59060ad Add welded shut message to vent scrubber (#38834) 2018-07-01 05:41:43 -05:00
AnturKandletterjay 18dd26ee3a Adds missing armor to accessories (#38800) 2018-07-01 05:41:32 -05:00
Thunder12345andletterjay 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
kevinz000andGitHub 8b1917f149 Update bag_of_holding.dm 2018-06-27 01:38:36 -07:00
81Dentonandletterjay f244ec31a0 Gives honey antibiotic properties (#38728)
* Gives honey antibiotic properties
henk

* 0.6
2018-06-26 20:30:41 -05:00
kevinz000andGitHub 8c71bbe36b Update ark_of_the_clockwork_justicar.dm 2018-06-26 17:44:11 -07:00
kevinz000andGitHub 4bddef70e2 Update ark_of_the_clockwork_justicar.dm 2018-06-26 17:43:52 -07:00
kevinz000andGitHub 8975695b54 Update ratvar_the_clockwork_justicar.dm 2018-06-26 17:43:19 -07:00
kevinz000andGitHub df68eb864a Update ratvar_the_clockwork_justicar.dm 2018-06-26 17:39:59 -07:00
kevinz000andGitHub 2f77e5894c Update research.dm 2018-06-26 16:39:22 -07:00
Nichandletterjay 4bbb592e12 Fixes IAA AI destroy objectives (#38745) 2018-06-26 17:02:24 -05:00
zxaberandletterjay 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
kevinz000andletterjay 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
Irafasandletterjay 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 Hardestyandletterjay 83a4003660 Move throwforce up to atom/movable (#38689) 2018-06-26 15:27:09 -05:00