Fox McCloud
aa2ff8ceea
Merge pull request #4843 from FreeStylaLT/youpieceoffuckingshitforgottousemapmerger
...
Good heavens look at the time it's SEC REMAP O' CLOCK
2016-07-15 22:32:28 -04:00
Fox McCloud
be8cc0432d
Merge pull request #4691 from taukausanake/plant_hud
...
Hydroponics HUD
2016-07-15 21:47:36 -04:00
Fox McCloud
5107bca5dd
Merge pull request #4899 from FlattestGuitar/loadouts
...
Did someone say "loadouts"?
2016-07-15 11:25:34 -04:00
Mieszko Jędrzejczak
96574c2e0b
Panders to Fox's underground gaming habits.
2016-07-15 17:16:52 +02:00
Fox McCloud
36c5d9d251
Merge pull request #5047 from LittleBigKid2000/chameleon-fix
...
Fixes chameleon jumpsuits not updating properly when EMPd
2016-07-15 05:59:53 -04:00
Isaac Erwin
4737f05736
Does the thing fox and kasparoVy said
2016-07-15 05:38:14 -04:00
Fox McCloud
dfce4b5d16
Merge pull request #5049 from Krausus/GottaLogEmAll
...
Improves Logging of Caught Runtimes
2016-07-14 23:59:18 -04:00
Fox McCloud
c3c9570d46
Merge pull request #5057 from Krausus/UsrTheSrcLuke
...
Fixes ERT Creation
2016-07-14 23:58:39 -04:00
Fox McCloud
66d7b89d9a
Merge pull request #4838 from FalseIncarnate/paradise_pop
...
Paradise Pop
2016-07-14 23:58:24 -04:00
Fox McCloud
f7b298f68e
Merge pull request #4895 from TullyBurnalot/ArmlessCuffs
...
Armless Cuffing and Legless Legcuffing Sense-Making
2016-07-14 23:30:38 -04:00
Krausus
dceb939539
Fixes ERT creation
...
- src is now used instead of usr, where appropriate, meaning one single
person won't be used in the generation of ALL ERT members
- Creation is no longer blocked by input from members who are being
generated
- Members will no longer exist as a naked body until the moment they
finish picking their class
2016-07-14 23:22:16 -04:00
KasparoVy
33347deb98
Fixes collar runtime by adding fexists checks.
...
Collars still fully function (tested by wearing a Sec bombsuit as a Vox
and as a Human, the correct collars rendered) and wearing a hardsuit as
a Vulp (the situation provided in the bug report) didn't cause a
runtime.
2016-07-14 22:49:43 -04:00
TullyBurnalot
c8801b2ff5
Adds sanity check for non-carbon mobs
2016-07-15 00:46:28 +01:00
Fox McCloud
4d3b818232
Merge pull request #5048 from Chakirski/bug1
...
Cigpacks Examine Fix
2016-07-14 18:54:23 -04:00
Krausus
0535765ba4
Improves caught exception logging
...
Also refactors away "log_runtime" config var to use its name for a
helper proc
2016-07-14 15:44:28 -04:00
Chakirski
6c8fa9f688
cigs...
2016-07-14 10:45:52 -05:00
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
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
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
Fox McCloud
3934b9f841
Merge pull request #4841 from DaveTheHeadcrab/grey_speech_fix
...
Grey Update
2016-07-11 23:13:38 -04: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