Commit Graph

13925 Commits

Author SHA1 Message Date
Fox-McCloud
e6c02e3a2c Merge remote-tracking branch 'upstream/master' into mining-tweaks 2016-07-15 23:16:00 -04:00
Fox McCloud
7c790a8b21 Merge pull request #4780 from Crazylemon64/space_ruins
Crazypilot's Space Ruins Port
2016-07-15 22:55:51 -04:00
Krausus
4c0f9ad01d Admin Log Tweaks
- Makes all admins see admin logs
- Adds a toggle for seeing admin log messages
- Removes admin log messages for jumping ghosts
2016-07-15 22:00:16 -04:00
Fox McCloud
be8cc0432d Merge pull request #4691 from taukausanake/plant_hud
Hydroponics HUD
2016-07-15 21:47:36 -04:00
SamCroswell
cfc15e2dc2 Personal Crafting - What's the point of leaving todos if I don't actually do them? 2016-07-15 16:41:31 -04:00
SamCroswell
0466499f86 Personal Crafting - Initial Commit 2016-07-15 16:25:37 -04:00
Mieszko Jędrzejczak
845317669a Coat armor value, whoops. 2016-07-15 21:50:26 +02:00
SamCroswell
324e4b92a9 PDA - Moves Overlays To Goonstation Folder 2016-07-15 13:35:56 -04:00
Crazylemon64
9752de5484 species path to species name 2016-07-15 10:13:32 -07: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
Fox-McCloud
01ffeb45fe more tweaks 2016-07-15 05:52:56 -04:00
Isaac Erwin
4737f05736 Does the thing fox and kasparoVy said 2016-07-15 05:38:14 -04:00
Fox-McCloud
6ae1e67471 bluespace crystals 2016-07-15 05:29:31 -04:00
Kyep
e24ab994d9 Adds flashlights to maint costumes 2016-07-14 23:25:50 -07:00
SamCroswell
e139f81412 PDA Slot Removal + PDA ID Changes 2016-07-15 00:54:14 -04:00
Kyep
78d3b321f6 Spacing 2016-07-14 21:25:38 -07: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
66d7b89d9a Merge pull request #4838 from FalseIncarnate/paradise_pop
Paradise Pop
2016-07-14 23:58:24 -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
Fox-McCloud
0fb2bfd8f1 Various Mining Tweaks 2016-07-14 22:07:04 -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
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
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
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
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
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
304b861fd4 height 2016-07-12 11:19:48 -05:00