Commit Graph

13853 Commits

Author SHA1 Message Date
Bjorn Neergaard b2629a56e2 Make wires use defines, put a wire var on /atom, fix tgui ui_host runtimes 2016-01-22 19:25:33 -06:00
Bjorn Neergaard 99e5764719 Refactor pizza_bomb, tweak pizza_bomb sprites
Thanks to @WJohn for the pizza bomb core sprites, and updated pizza box sprites

Removes the pizza_bomb and replaces it with pizzabox/bomb. Adds a special bomb core
for pizza bombs (a pizza bomb core can be used on pizza boxes and regular bombs, but
regular bomb cores cannotbe used for pizza bombs), and tweaks wire code a little bit.
2016-01-22 19:22:11 -06:00
Bjorn Neergaard 4ec75a5ecb Add better pizza bomb sprites 2016-01-22 19:22:10 -06:00
Bjorn Neergaard 87b0857b93 Refactor wire datums
Finish wire port and refactor wire datums to use string keys; widen color
range to support more wires and more colors.
2016-01-22 19:22:09 -06:00
AnturK cda2f26d56 tgui wires initial 2016-01-22 19:13:23 -06:00
tkdrg 14f90d8f1e Merge pull request #14748 from xxalpha/airlocktiming
Changed APC wire pulsing and airlock autoclose() to use timers.
2016-01-22 21:36:56 -03:00
tkdrg c26a9488d4 Merge pull request #14762 from AnturK/botradiofix
Fixes Pingsky Radio
2016-01-22 21:34:17 -03:00
Remie Richards 6df21ac81f Merge pull request #14764 from ChangelingRain/slimeconsume
Slimes can no longer feed on simple animals that are immune to clone and toxin damage
2016-01-23 00:28:29 +00:00
xxalpha 6aaf9c43a6 Made foam transparent and changed its layer to be above mobs. 2016-01-22 23:57:18 +00:00
tkdrg dbf51fd9c4 Merge pull request #14766 from Incoming5643/let_me_tell_you_a_tail
Fixes spawned/badmin'd lizards being featureless and missing tails
2016-01-21 22:21:54 -03:00
Incoming d29761d213 Fixes spawned/badmin'd lizards being featureless and missing tails.
This list was accurate before the cat features were added, but wasn't change when they were. Using random_features() both future proofs against new features in the future and lets lizards have unique appearances when generated from nothing by admins/events. Lizards with proper save_files/prefs will overwrite these random features during creation.

Fixes #14679

Almost everything about this bug initially tested and looked into by @thelongbowman who I'm not sure actually has a github account but whatever!
2016-01-20 21:14:39 -05:00
tkdrg 717ebcf6bb Merge pull request #14707 from xxalpha/beachicons
Divide beach coast icon into two.
2016-01-20 20:34:41 -03:00
xxalpha de44d7ec43 Changed APC wire pulsing and airlock autoclose() to use timers.
a

round
2016-01-20 21:26:44 +00:00
Nerd Lord cd249d41f3 Slimes can no longer feed on simple animals that are immune to clone and toxin damage
Simple animal damage procs return the damage done(as one would expect)
2016-01-20 15:38:58 -05:00
AnturK b879d40f04 Fixes Pingsky Radio 2016-01-20 16:39:57 +01:00
Firecage d2bd6871d5 Merge Conflict Fix 2016-01-20 14:07:14 +02:00
duncathan salt 7ea17e7925 Merge pull request #14743 from neersighted/mo_tguis
tgui: fix-22
2016-01-19 23:40:04 -06:00
Bjorn Neergaard 6ac9997edc Remove atmos radio delay; fix setting external pressure; fix phantom atmos machines
Fixes #11953
2016-01-19 23:29:54 -06:00
xxalpha 638a47d4ac Merge remote-tracking branch 'upstream/master' into smoothballs 2016-01-20 01:31:05 +00:00
Bjorn Neergaard 3ae2397d9f Fix interacting with intercoms as AI 2016-01-19 17:02:59 -06:00
Bjorn Neergaard 1c34479376 Fix uplink code once and for all
Fixes #14733
2016-01-19 16:42:57 -06:00
Bjorn Neergaard ce36ee73e9 Fix uplink size 2016-01-19 08:41:51 -06:00
Bjorn Neergaard d87ddf0790 Add parent call, fixing uplink runtime 2016-01-19 08:41:51 -06:00
Bjorn Neergaard e54ea7e451 Tweak a few UIs; try to fix canister relabel 2016-01-19 08:41:50 -06:00
xxalpha aff9db930d Merge remote-tracking branch 'upstream/master' into emaggedbots 2016-01-19 14:38:26 +00:00
duncathan salt ae2b35124e Merge pull request #14711 from Shadowlight213/Playerooccolorfix
Fixes the Reset player OOC color verb not working
2016-01-19 07:29:23 -06:00
duncathan salt 1b2ec539af Merge pull request #14708 from xxalpha/aimoduleinstall
Installing laws to an empty AI core will now use install() instead of snowflake.
2016-01-19 07:28:25 -06:00
duncathan salt 75755a12b8 Merge pull request #14710 from KorPhaeron/AI_fix
Fixes AI not recieving malf powers and cyborgs not recieving 0 law
2016-01-19 07:27:16 -06:00
duncathan salt 410885e609 Merge pull request #14709 from xxalpha/thiswasalreadyfixed
jump to area uses safepick
2016-01-19 07:26:33 -06:00
duncathan salt f9e35f1695 Merge pull request #14706 from xxalpha/straightouttajacket
Fixes the straightjacket
2016-01-19 07:24:51 -06:00
Firecage d1327d4076 Merge conflict fix 2016-01-19 10:02:50 +02:00
duncathan salt 536beac2f9 Merge pull request #14732 from tgstation/atmosfixes
Atmos fixes
2016-01-18 22:13:37 -06:00
Shadowlight213 92103ac3f4 Defines 2016-01-18 20:08:27 -08:00
duncathan ed974ff559 atmos fixes 2016-01-18 21:24:26 -06:00
Razharas ac75a418a1 Merge pull request #14658 from nullstation/bug_14599
Call check_shields when attacked by an abductor baton.
2016-01-19 03:49:42 +03:00
Razharas 8a5edaa06e Merge pull request #14693 from xxalpha/airlockpower
Fixed airlock lights turning on when airlock is unpowered.
2016-01-19 03:46:12 +03:00
tkdrg 0a6c050862 Merge pull request #14726 from neersighted/mo_tguis
Hotfix for MULEs; half of the UIs
2016-01-18 20:11:14 -03:00
Bjorn Neergaard 41caa93330 Hotfix for display issues and UIs droping ui_act calls 2016-01-18 17:00:15 -06:00
duncathan salt ee1067cb5c Merge pull request #14686 from neersighted/mo_tguis
Mo' tgui mo' commits
2016-01-18 14:54:12 -06:00
Bjorn Neergaard aa8b6bfac2 Factor out radio helpers 2016-01-18 14:30:27 -06:00
Bjorn Neergaard 5cfc60d9da tgui radios; clean up frequency code 2016-01-18 14:28:33 -06:00
Bjorn Neergaard a1ff8e8783 Refactor tgui interactions
Removes a lot of duplicated code, thanks to @nullquery's parent tweaks
2016-01-18 14:27:56 -06:00
Bjorn Neergaard e2c0ea9cca tgui atmos and station alert consoles 2016-01-18 14:27:55 -06:00
Bjorn Neergaard b33c6f216d Tidy tooltips; hide lock button from non-lockable uplinks 2016-01-18 14:27:34 -06:00
Bjorn Neergaard 718639a1c3 Add new syndicate logo
Thanks to @YotaXP
2016-01-18 14:26:28 -06:00
Bjorn Neergaard 4a617062d8 Refactor uplinks; fix up tooltips and make uplink more interactive 2016-01-18 14:25:52 -06:00
Remie Richards 6752d12ee5 Merge pull request #14696 from Razharas/BibleFix
Fixes bible producing unlimited stuff
2016-01-18 20:23:47 +00:00
Bjorn Neergaard ff5d6292c8 tgui uplinks; repath uplinks 2016-01-18 14:22:00 -06:00
Bjorn Neergaard 624b48ba09 Clarify atmos control labels 2016-01-18 14:21:59 -06:00
Bjorn Neergaard 50ce22e5ec Fix air alarm environmental thresholds 2016-01-18 14:21:59 -06:00