Commit Graph

7430 Commits

Author SHA1 Message Date
KasparoVy
f425f0ae4e Plasmaman Suit only extinguishes when you're on fire.
Had to make it disregard negative firestacks because showers (and
probably some other things). This check is extremely similar to one just
a few lines above, so it makes sense.
2017-02-28 00:50:03 -05:00
Crazy Lemon
186edb14e7 Merge pull request #6468 from tigercat2000/job_refactor_tg
Ported /tg/'s outfit datums, refactored job controller to support them
2017-02-25 17:54:01 -08:00
Crazy Lemon
992fae8cf5 Merge pull request #6500 from davipatury/secure_data-ui
Security Records Nano-UI-ification
2017-02-25 16:59:59 -08:00
Fox McCloud
1e44336a3a Merge pull request #6555 from KasparoVy/vox-plasmaman-reagent-bsns
Reagent Oxygen is Toxic to Vox, Reagent Plasma Heals Plasmamen, Plasmaman Suit Autoextinguish & Plasmaman Exposure Burn Fixes
2017-02-25 17:11:08 -05:00
Fox McCloud
616a0ff8d1 Merge pull request #6446 from Kyep/terrorspiders-PR3
Terror Spiders 3 - Awaymission & AI
2017-02-25 17:04:30 -05:00
Kyep
6fac5bcc98 Tiger changes 2017-02-25 06:06:51 -08:00
Tigercat2000
fe5fb2c0f8 Merge remote-tracking branch 'upstream/master' into job_refactor_tg 2017-02-25 05:42:47 -08:00
Fox McCloud
1044b2b84d Merge pull request #6515 from Crazylemon64/fast_servermonitor
Telecomms monitor is speedier now
2017-02-24 23:25:47 -05:00
Crazy Lemon
e81592c3db Merge pull request #6499 from davipatury/med_data-ui
Medical Records Nano-UI-ification
2017-02-24 18:53:33 -08:00
Crazylemon64
2f8feff402 Refactors tcomms stuff a little 2017-02-24 18:10:08 -08:00
Crazy Lemon
9382db1767 Merge pull request #6430 from FalseIncarnate/botany2
Botany adjustments/re-addition/fixes/whatever (RE-UPLOAD)
2017-02-24 12:03:07 -08:00
Fox McCloud
45c9a3e550 Merge pull request #6573 from Markolie/zefix
Fixes
2017-02-24 14:57:38 -05:00
Markolie
01c7c6eb43 Fix chef preview hat 2017-02-24 12:56:09 +01:00
KasparoVy
3c24f6e255 Dumbs Down Plasmaman Suit Reloading & Amends Plasmaman Suitless Ignition
Plasmaman suits no longer have an in-depth system by which their
autoextinguisher can be replenished, but a simple one.

Plasmamen now combust in the same circumstances regular gasous plasma
will as defined in LINDA code.
2017-02-24 02:37:20 -05:00
KasparoVy
4bb1c57d7e Conflict resolution
Unironically conflicting with another one of my PRs
2017-02-23 17:26:22 -05:00
Markolie
c5b897a951 Fix fax machine logout issue, fix card eject telekinesis interaction, fix death alarm follow link, fix flavor text not hiding when unknown, fix spacepod mining lasers 2017-02-22 18:24:43 +01:00
KasparoVy
61670a24a0 Plasmaman Plasma Reagent Healing Proc Change 2017-02-22 06:37:42 -05:00
Krausus
ef1859b877 Swaps choices in pre-ghosting warning
"Stay in body" is now the choice that's selected by default
2017-02-22 02:21:23 -05:00
KasparoVy
864260efde Removes Snowflake Name-checks and Amends Plasmen Suit Extinguish Messages
Removes a bunch of bodyflags from Armalis that they really shouldn've
had as well.
2017-02-22 01:44:15 -05:00
KasparoVy
9dad350329 Desnowflakes the Special Reagent Handling & Amends+Completes Autoextinguish & Fixes Plasmaman Immolation Immunity Bug
- Moved Vox and Plasmamen special reagent handling to the Species datum
to avoid snowflaking in reagent code
- Removed the AUTOEXTINGUISH flag and turned it into a var to conserve
flags
- Adds Plasmaman EVA suit auto-extinguisher reloading. Eject the
depleted cartridges with an action button and fill them as you would a
fire extinguisher, then just slot them back into the suit.
- Fixes a bug where having NOBREATHE cured a Plasmaman of burning when
exposed to atmosphere.
- Fixes a bug where Plasmamen would burn in space or in totally-Plasma
environments. Inspired by /vg/station.
2017-02-22 00:12:01 -05:00
KasparoVy
829dcf4229 Oxygen is Toxic to the Vox, Plasma Heals Plasmamen, Plasmaman Suit Autoextinguishes, Oxygen Burns Plasmamen
Oxygen is toxic to the Vox (as toxic as plasma).
Plasma healing plasmaman from swindly @
https://github.com/tgstation/tgstation/pull/24209
Plasmaman suit auto-extinguishing actually does something now.
Oxygen burns Plasmamen.
2017-02-21 07:26:04 -05:00
Kyep
a2731fcb08 Fixes, balance tweaks
- Fixes broken spider vision.
- Mother: spiderlings spawned from the death of a mother now grow up
faster than normal, as they were already mostly-grown.
- Gray: gray spiders spin webs, and regen, faster. They were rebalanced
because they were quite weak compared to reds and greens.
- Queen: queens now get a boost to egglaying speed once they reach 10,
and then 20, eggs laid. This will occur 20 and 40 minutes, respectively,
after she has nested, assuming she lays all eggs she can. This is
intended to break stalemates and force people to actually confront the
queen, rather than simply endlessly killing her minions but leaving her
alive.
- UO71/awaymission: reduces WAEGs in start room to 3, adds two to
armory, moves borg illegal module to syndicate room to make it much
harder to obtain. Also removes retro laser gun from armory. Overall,
this is a nerf to the amount of loot available from the mission, and it
makes some of the best loot much harder to get.
2017-02-20 20:45:24 -08:00
Fox McCloud
36a90e7623 Merge pull request #6483 from tigercat2000/ai_open
Add [OPEN] option for AI in radio messages
2017-02-20 09:48:01 -05:00
Kyep
06e827081f dragging someone off a web they trigger prevents the web self-deleting 2017-02-19 03:35:28 -08:00
Kyep
bdd206345a Crazylemon suggestion, adds job weight, tweaks event 2017-02-19 03:19:22 -08:00
davipatury
93d1cd7c6e Security Records nano-ui. 2017-02-18 15:58:01 -02:00
davipatury
ba193fdd10 Medical Records nano-ui. 2017-02-18 14:36:37 -02:00
Mark van Alphen
f42b9cf383 Merge branch 'master' into admin_interact 2017-02-18 15:41:16 +01:00
Fox McCloud
38e6c45407 Merge pull request #6465 from Allfd/CoughSneezeFix
Fixes cough and sneeze oversight
2017-02-18 07:58:31 -05:00
Fox McCloud
4617206927 Merge pull request #6487 from Crazylemon64/fix_mindswap
Mind transfer works again
2017-02-18 07:52:05 -05:00
Kyep
483da74982 Rebalances/buffs white spider 2017-02-17 23:34:35 -08:00
Crazylemon64
f5f7383ab8 Fixes a speech_span runtime 2017-02-17 22:44:19 -08:00
Crazylemon64
e9ef99d68d Mind transfer works again 2017-02-17 21:54:13 -08:00
Tigercat2000
b2868c31e0 Add [OPEN] option for AI in radio messages
Also mildly refactors hear_radio to kill those nasty istype(src)'s.

This makes an [OPEN] link appear on all radio messages the AI hears (to
the right of the follow link). When clicked, it allows the AI to open
the door nearest to the speaker (or, if it is a voice changer, the door
nearest to the poor sap who had his voice stolen)
2017-02-17 17:43:33 -08:00
allfd
e435701531 Adds unique Vox coughs and sneezes 2017-02-17 18:39:24 -05:00
Tigercat2000
14ba6fded6 Ported /tg/'s outfit datums, refactored job controller to support them
Players:
 - The only thing that you should notice is that your backpack options
 have changed. Instead of being "None", "Backpack", "Satchel", and
 "Satchel Alt", there are 6 options:
   - "Grey Backpack": Ensures you always recieve a plain grey backpack.
   - "Grey Satchel": Same as the above, grey, plain, satchel.
   - "Grey Dufflebag": So you don't have to rush the locker room, I
   guess. Just kinda ransacked it from /tg/. Happy to revert it, please
   do not post a five paragraph text wall calling me a shitlord
   powergaming hitler-loving furry.
   - "Leather Satchel": It's a leather satchel. What the hell did you
   think it was?
   - "Department Backpack": Gives you the department's default backpack.
   Grey for most jobs.
   - "Department Satchel": It gives you the department's default
   satchel; A grey satchel if the department doesn't have one.

Coders:
 - The above means this needs a minor SQL change:
   ```
   SQL goes here
   I'll write a query later
   Can't be bothered now
   Kill me please
   ```

 - This is a cleaner method of handling job equipment than
 "M.equip_or_collect" x 1000. Jobs specify a '/datum/outfit' datum,
 which defines all of the things to equip to the user.

 - Minor note: equip_or_collect will no longer ever generate a plastic
 bag. It will instead just drop stuff on the floor if it can't stuff it
 into a mob. If this is even slightly a point of contention, more than
 happy to revert it; It was just requested by Fox.
   - Addendum: This also has the effect of making it so that labcoats
   are just thrown onto the floor if you have a loadout suit. It's not
   really avoidable. Uniforms and suits are equipped before the
   backpack.

 - Changes from /tg/:
   - Changed all of the "H.equip_to_slot_or_del" calls into invoking a
   new "equip_item" proc; This is used to support a new variable called
   "collect_not_del". Job outfits use this, it makes it so that the
   system calls equip_or_collect instead of equip_to_slot_or_del. The
   idea being that job items should never be lost to the void,
   especially because they can conflict with loadout items.

TODO:
 - Retrofit "Equip Mob" verb to use this for all of the non-job options
 - Fully implement head announcements(?)
   - May be best for a second PR that addresses all of the real issues
   with our current job system

( Now go reread that SQL code block :) )
2017-02-17 11:35:45 -08:00
Mark van Alphen
dea264faf2 Merge branch 'master' into stationgoals 2017-02-17 18:05:15 +01:00
Kyep
17adda43b8 Simplifies UO71 blast doors, fixes multi-msg bug 2017-02-16 23:52:17 -08:00
Krausus
4754d6b4b3 Fixes some sounds not being cached properly 2017-02-17 02:37:26 -05:00
allfd
8a7b1ad2fc Fix list issue 2017-02-15 22:46:10 -05:00
allfd
d3444658c9 Fixes cough and sneeze oversight 2017-02-15 22:11:32 -05:00
Kyep
39ccbbb022 Clarifies that greens only get fed, and spiders only get regen boost, from human/ type prey 2017-02-15 03:09:55 -08:00
Crazylemon64
9eb59bd590 Squishy cough 2017-02-15 02:00:51 -08:00
Crazylemon64
36762c70f5 Ruins immersion 2017-02-14 23:51:54 -08:00
Crazy Lemon
4366ba550e Merge pull request #6300 from Alexshreds/disease_effects
Adds Cough and Sneeze Sounds
2017-02-14 23:38:23 -08:00
Crazy Lemon
77a98d9a21 Merge pull request #6408 from KasparoVy/Fixing-VoxTailBug
Fixes Vox-tail Bug
2017-02-14 23:24:49 -08:00
Crazy Lemon
dd4a64ea6a Uses evil memetainer powers
Pre-emptively prevents empty list runtimes
2017-02-14 22:49:41 -08:00
Crazy Lemon
96afaca62c Merge pull request #6293 from KasparoVy/deadchat-anon-pref
Makes Deadchat Anonymity Persistent as a Preference
2017-02-14 20:54:27 -08:00
KasparoVy
87aa937d8d Fixes a bug w/ frankenstein limbs and Excises mob icobase/deform so the organs handle it.
Fixes a bug w/ the first commit where frankenstein limbs got converted to the owner's appearance (icobase/deform) if the owner HAS_ICON_SKIN_TONE.
2017-02-14 21:39:40 -05:00
Crazy Lemon
ebe28b3372 Merge pull request #6425 from Markolie/stackprogressbars
Progress bars now stack vertically
2017-02-14 13:27:47 -08:00