Commit Graph

6813 Commits

Author SHA1 Message Date
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
Fox-McCloud
5216b39339 Ports TG's Weather System 2016-07-14 04:29:28 -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
Chakirski
2911c89733 Fox you're krilling me! 2016-07-13 11:53:54 -05: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
Chakirski
304b861fd4 height 2016-07-12 11:19:48 -05:00
Chakirski
f8ce4ed19d Ahh yes, "Reapers" 2016-07-11 23:17:17 -05:00
Fox McCloud
3934b9f841 Merge pull request #4841 from DaveTheHeadcrab/grey_speech_fix
Grey Update
2016-07-11 23:13:38 -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
TheDZD
2b5e36b296 Merge pull request #4935 from Twinmold93/martialartsvampire
The Sleeping Carp Vampires
2016-07-11 21:10:57 -04:00
TheDZD
813f6f3778 Merge pull request #4962 from Fox-McCloud/ipc-change
Removes IPC Firesuit Cheese
2016-07-11 21:01:31 -04:00
TheDZD
960676d53b Merge pull request #4964 from Kyep/cryo_ghost
Improves Cryoing
2016-07-11 21:01:04 -04:00
TheDZD
66c8eb899e Merge pull request #4966 from Fox-McCloud/ntrep-cane
Nanotrasen Rep Cane Tweak
2016-07-11 20:59:34 -04:00
TheDZD
ca7530f58d Merge pull request #4968 from Fox-McCloud/blood-refactor
Blood Refactor+Fixes
2016-07-11 20:57:25 -04:00
TheDZD
2f9dab5f1e Merge pull request #4978 from Krausus/UhOhImSlowingDownAlternateAppearanceCodeAgain
Actually Fixes Those Stupid Plants (By Fixing Alternate Appearances)
2016-07-11 20:52:40 -04:00
Fox McCloud
595297fb6e Merge pull request #4991 from Krausus/ThereCanOnlyBeOneHookSystem
Fixes Morgue Updating and Eliminates VG-style Hooks
2016-07-11 20:41:32 -04:00
Krausus
355fb3c080 Fixes morgue updating and removes VGhooks 2016-07-11 17:39:21 -04:00
SamCroswell
d79302ede6 Merge Conflict Resolution 2016-07-11 13:04:30 -04:00
Fox-McCloud
b7c71c7c76 differences 2016-07-11 09:23:43 -04:00
Fox-McCloud
2a3ccf3729 Cyborg Upgrade Additions and Refactor 2016-07-11 06:16:44 -04:00
SamCroswell
e84ebcbca7 Jay Wingler Fluff Item 2016-07-11 01:53:52 -04:00
Chakirski
7635de3020 Sliceable cutlets are sliceable not sliceable 2016-07-10 18:22:32 -05:00
Fox McCloud
4fa956054c Merge pull request #4959 from TheDZD/salt-for-the-salt-god
Adds "salts" to the Say Verbs for Deadchat
2016-07-10 19:10:54 -04:00
Krausus
308c8a5667 Fixes alternate appearances right
Still uses inefficient for loops in Login and Destroy, though~
2016-07-10 17:56:53 -04:00
TheDZD
a97f0eaeea Merge pull request #4952 from Fox-McCloud/borg-power
Borg Power Use Refactor
2016-07-10 14:23:37 -04:00
monster860
009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
Kyep
7c47dfcc56 Spacing 2016-07-10 02:47:43 -07:00
Fox-McCloud
7165360832 Blood Refactor+Fixes 2016-07-10 02:58:00 -04:00
Fox-McCloud
9a8b9a29ee Nanotrasen Rep Cane Tweak 2016-07-09 22:41:46 -04:00
Kyep
43afd64396 Improves Cryoing
- Changes cryoing, such that if you use OOC->Ghost while in a cryopod,
you are instantly moved to long-term storage. After all, you can't get
back into your body at that point anyway, so keeping your body around
for 30 minutes before announcing that you've disappeared is pointless.
- Changes the notification given to antags whose target cryos, to make
it slightly more obvious.
- Makes long-term storage announcements include stored person's rank (if they have one).

Added rank to cryo storage announcement

Removes list() call from pick()
2016-07-09 19:22:34 -07:00
Fox-McCloud
e0b50cd87a tweak 2016-07-09 22:21:28 -04:00
Twinmold
e437e256f1 No Unneeded 0's in Return
Title... Really...
2016-07-09 21:19:36 -05:00
Fox-McCloud
6bd7d73f7b Removes IPC Firesuit Cheese 2016-07-09 20:43:49 -04:00
Fox McCloud
bf07402fb9 Merge pull request #4948 from TullyBurnalot/DroneFix
Drone AntagHUD Fix
2016-07-09 18:55:39 -04:00
TheDZD
04d5219d6a Merge pull request #4929 from Fox-McCloud/hit-reactions
Hit reactions
2016-07-09 18:30:37 -04:00
TheDZD
306f1a8e2d Ghosts for the ghost throne 2016-07-09 17:58:39 -04:00
Fox McCloud
cb26d1eb00 Merge pull request #4943 from Tastyfish/healthfix
Makes human's healthdoll immediately update upon health being changed
2016-07-09 04:38:54 -04:00
Twinmold
5888b6f003 Moves Check to human_attackhand.dm
Moves the check from sleeping_carp.dm to human_attackhand.dm, and puts
vampire bite as priority over martial arts when aimed at the head.
2016-07-09 03:04:07 -05:00
Fox-McCloud
405df28fab Borg Power Use Refactor 2016-07-09 01:50:26 -04:00
TullyBurnalot
a0a95ca28a - Replaced "return 0" with "continue"
Should be fine now.
2016-07-09 05:03:55 +01:00
TullyBurnalot
14ec113bbd Fixes Drone AntagHUD issue
- Activating Antag HUD will now stop you from being a viable candidate
for repaired maintenance drones
2016-07-09 04:30:25 +01:00
Tastyfish
37d2721c76 Makes healthdoll immediately update upon being hit 2016-07-08 19:28:07 -04:00
Fox McCloud
c07a4e7c7e Merge pull request #4919 from Krausus/AltAppearanceFixes
Alternate Appearance Fixes
2016-07-08 18:02:01 -04:00
Fox McCloud
699c7586c7 Merge pull request #4918 from Chakirski/EMP-Binary
Adds disable_component() to Cyborgs - EMPs Disable Binary
2016-07-08 18:01:08 -04:00
Chakirski
8f23ac930a Revert "sync"
This reverts commit 3700a7ff8b.
2016-07-08 15:42:15 -05:00
Chakirski
3700a7ff8b sync 2016-07-08 15:33:26 -05:00
Chakirski
3a3f7e7218 Revert "Merge branch 'BACON!' of https://github.com/Chakirski/Paradise into BACON!"
This reverts commit 5d0cf2b3f8, reversing
changes made to b7897435c3.
2016-07-08 15:08:37 -05:00
Chakirski
d432cf1239 Pink bacon 2016-07-08 14:58:46 -05:00