Commit Graph

22686 Commits

Author SHA1 Message Date
Isaac Erwin
5455882433 Fixes chameleon jumpsuits not updating properly when EMPd
Fixes chameleon jumpsuits not updating the user's appearance when EMPed
and not properly reverting back to the default form when the EMP effect
wears off.
2016-07-14 09:03:16 -04:00
Kyep
e22d4abb0c Changes 'Strip before dressing' prompt 2016-07-14 03:21:47 -07:00
Fox-McCloud
84f9a06881 probably not necessary 2016-07-14 04:47:11 -04:00
Fox-McCloud
5216b39339 Ports TG's Weather System 2016-07-14 04:29:28 -04:00
Kyep
47a06a739a Improves the admin 'select equipment' verb
The "select equipment" verb is a button used by admins to dress up
characters for events.
This PR tweaks it to fix some issues and add a few new options.

Major changes:
- All costumes now include ID cards. Including "as job..." options.
- ERT options now actually work. You can outfit a character as any kind
of ert (amber/red/gamma) and any role in that ERT
(sec/medical/eng/commander).
- "Spy", "NT VIP Guest", and "survivor" have been added to the list of
choices. Spy is a cheap traitor with a silenced gun and emag. NT VIP
Guest is a centcom guest with no gear. Survivor is a civilian who
survived some terrible event.

Other Changes:
- reaper: starts out dust implanted
- nanotrasen officer: renamed to nt navy officer
- nanotrasen captain: renamed to nt navy captain
- special ops officer: renamed to nt special ops officer, with different
(more combat-oriented) loadout than joining as this job from the job
screen
- all NT CC outfits: changed headset to centcom, added dust/death
implanters to backpacks
- Tunnel Clown: added full toolbelt
2016-07-14 01:27:07 -07:00
SamCroswell
d0b818cc1b My commit line is a mess at this point IDGAF 2016-07-14 01:45:21 -04:00
SamCroswell
8b94d840fb PLEASE SEND HELP 2016-07-14 01:44:40 -04:00
SamCroswell
a42dcebc21 Fixes a bug with the flash C4 2016-07-14 01:14:22 -04:00
Kyep
f22f5747cd Deletes Parole Implants
Also deletes parole kit from warden's locker, as it is pointless now.
2016-07-13 21:44:50 -07:00
SamCroswell
890ae146ca Flashbang Explosives 2016-07-13 23:42:31 -04:00
Fox McCloud
1bcd366f5a Merge pull request #5042 from DaveTheHeadcrab/wingler_fluff
Jay Wingler Fluff Item Fix
2016-07-13 23:12:33 -04:00
SamCroswell
bb6b7bbf30 Minor Fix 2016-07-13 23:06:35 -04:00
SamCroswell
fb0e72cc84 Quick Fix 2016-07-13 23:01:01 -04:00
FalseIncarnate
0c4f898d95 more styling and gap removal
from here out, the commit names are going to get remarkably less useful
as i become more frustrated with krausus pointing things out
post-commit.
2016-07-13 22:46:43 -04:00
FalseIncarnate
7d8080e489 spacing 2016-07-13 22:26:26 -04:00
SamCroswell
cf90405f56 Plastic Explosives Update 2016-07-13 22:04:23 -04:00
Fox McCloud
c03aebaed9 Merge pull request #5002 from Chakirski/holograms
Ahh yes, "Reapers"
2016-07-13 21:50:14 -04:00
TheDZD
bb71be600c Merge pull request #5006 from Fox-McCloud/fans
Fantastic PR
2016-07-13 21:48:10 -04:00
Fox McCloud
466eb8731a Merge pull request #5011 from TullyBurnalot/ButtEmag
Adds Emagged Photocopier Cooldown
2016-07-13 21:46:49 -04:00
TheDZD
0bedf9668b Merge pull request #5014 from Fox-McCloud/actual-fix
Actually Fixes Medical, Security, and Employment Records
2016-07-13 21:44:47 -04:00
monster860
717bdf79c0 ChemMaster fixes 2016-07-13 19:15:03 -04:00
Fox-McCloud
cb111fbec4 tweak 2016-07-13 19:14:57 -04:00
FalseIncarnate
33e75e2d93 more tweaks for styling and such 2016-07-13 14:38:21 -04:00
Chakirski
2911c89733 Fox you're krilling me! 2016-07-13 11:53:54 -05:00
Fox-McCloud
d8895b0ce9 Actually Fixes Medical, Security, and Employment Records 2016-07-13 05:08:44 -04:00
Mieszko Jędrzejczak
7f59ffda31 Fixes srcs, srcs. 2016-07-13 10:34:51 +02:00
Fox McCloud
22484a4073 Merge pull request #5012 from Kyep/vampfix
Makes Vampire preference appear on Traitor panel
2016-07-13 03:02:11 -04:00
Kyep
17630cef32 Makes Vampire preference appear on Traitor panel 2016-07-12 23:48:41 -07:00
TullyBurnalot
ed1e6b1305 Adds Photocopier Cooldown when emagged 2016-07-13 04:25:58 +01:00
Mieszko Jędrzejczak
52fbdd48b6 Adjusts. 2016-07-13 03:53:14 +02:00
TheDZD
8878cc9b15 Merge pull request #4980 from Fox-McCloud/arse-nath
Adds in Rathen's Secret
2016-07-12 21:26:02 -04:00
TheDZD
dd2390d9bb Merge pull request #4987 from Fox-McCloud/cyborg-tweaks
Cyborg Upgrade Additions and Refactor
2016-07-12 21:22:57 -04:00
Fox-McCloud
3acce26982 Fantastic PR 2016-07-12 18:21:02 -04:00
Fox McCloud
5dc65d9137 Merge pull request #4984 from Kyep/evilfax_cluwne
Adds Cluwne EvilFax
2016-07-12 17:14:50 -04:00
Fox McCloud
a6323e0bde Merge pull request #5003 from Tastyfish/pipecheck
Fixes Check Piping verb
2016-07-12 17:13:15 -04:00
Chakirski
b1d1b17844 boop 2016-07-12 11:29:01 -05:00
Chakirski
304b861fd4 height 2016-07-12 11:19:48 -05:00
Chakirski
f8ce4ed19d Ahh yes, "Reapers" 2016-07-11 23:17:17 -05:00
Tastyfish
463fce5453 Fixes Check Piping verb 2016-07-12 00:10:31 -04:00
TullyBurnalot
2ca5a17c5a Removes trailing return 2016-07-12 04:24:45 +01:00
Fox McCloud
3934b9f841 Merge pull request #4841 from DaveTheHeadcrab/grey_speech_fix
Grey Update
2016-07-11 23:13:38 -04:00
TullyBurnalot
8682da932a EMPing Restorers kills AIs inside
- No needless merges happened
- AI Integrity Restorers, if EMP'd, ghost any AI player inside, then
destroys said AI
2016-07-12 04:09:49 +01:00
Fox-McCloud
a78c6cbf5d changes 2016-07-11 22:45:44 -04:00
SamCroswell
46954091e6 Minor Tweaks 2016-07-11 22:28:35 -04:00
Fox McCloud
b787af15f8 Merge pull request #4934 from Chakirski/BACON!
Adds AUTHENTIC, JUICY, AMAZING BACON!
2016-07-11 21:23:41 -04:00
Fox McCloud
c803c4f752 Merge pull request #4911 from Kyep/exile_option
Makes Exile & Lethal Injection Viable
2016-07-11 21:21:16 -04:00
TheDZD
5ba6e17739 Merge pull request #4917 from TullyBurnalot/BureaucracyUpdate
Bureaucracy Update
2016-07-11 21:20:06 -04:00
Chakirski
a031ebe889 Update snacks.dm 2016-07-11 20:17:30 -05:00
TheDZD
2b5e36b296 Merge pull request #4935 from Twinmold93/martialartsvampire
The Sleeping Carp Vampires
2016-07-11 21:10:57 -04:00
Fox McCloud
829bbdcba9 Merge pull request #4951 from Kyep/ert_improvements
Improves ERTs
2016-07-11 21:08:34 -04:00