Commit Graph

7408 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Crazy Lemon 1e84d34559 Merge pull request #6351 from tigercat2000/goonchat_administrator_tools
Goonchat Admin Filters
2017-02-14 13:09:24 -08:00
KasparoVy 46158e7854 conflict resolution 2017-02-13 06:35:17 -05:00
Fox McCloud 90f034b470 Merge pull request #6097 from Kyep/terrorspiders-PR2
Terror Spiders - Part 2
2017-02-13 06:27:32 -05:00
Fox McCloud 300751373d Merge pull request #6280 from fludd12/Grey-Wingdings
Wingdings Revival^2
2017-02-13 06:26:56 -05:00
FalseIncarnate b0f46a28a1 Re-Adds Hydro Tray Covers
Also fixed a derp with the define
2017-02-12 23:32:49 -05:00
Kyep f8647a2108 Crazylemon spacing changes 2017-02-12 19:52:37 -08:00
Markolie d0247fff2c Progress bars now stack vertically. Also adds a bunch of lazy list helpers. 2017-02-12 23:51:50 +01:00
KasparoVy 6b50f16a12 Fixes Vox-tail Bug
When a new Vox spawns in, your tail won't suddenly break (become a
different colour).
Abstracts icobase/deform/tail from the species definitions a bit so
individual mobs can have a different icobase/deform/tail than other mobs
of the same species.
2017-02-12 02:28:15 -05:00
Markolie f701813f6e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into admin_interact
# Conflicts:
#	code/modules/client/client defines.dm
2017-02-12 00:03:49 +01:00
Markolie 900653ea0e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx 2017-02-11 20:31:23 +01:00
Markolie 4d857de148 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals
# Conflicts:
#	icons/effects/beam.dmi
2017-02-11 18:26:06 +01:00
uraniummeltdown 3df3688e72 move all crates to crates.dmi 2017-02-11 17:44:20 +04:00
Kyep 9f20cb1685 Fixes merge conflict in event_container 2017-02-10 22:07:05 -08:00
Fox McCloud 04f5276047 Merge pull request #6350 from Markolie/lavaland_updates
Add remaining Lavaland loot, kinetic accelerator refactor
2017-02-11 00:02:42 -05:00
Crazy Lemon cef7f35ce3 Merge pull request #6161 from tigercat2000/goonlights
Goonlights
2017-02-10 19:21:20 -08:00
Crazy Lemon 17281506d2 Merge pull request #6123 from KasparoVy/vulp-cblind
Vulpkanin & Tajara mod. Colour Vision, Darksight to Eyes, Internal Mech(assist) Organ Icons
2017-02-10 18:27:58 -08:00
Markolie b0d4f5d92a Various fixes 2017-02-10 18:55:23 +01:00
Markolie c14b560ee0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx 2017-02-10 18:21:06 +01:00
Markolie c93a592102 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
# Conflicts:
#	code/modules/shuttle/supply.dm
2017-02-10 18:19:53 +01:00