Commit Graph

6725 Commits

Author SHA1 Message Date
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
e84ebcbca7 Jay Wingler Fluff Item 2016-07-11 01:53:52 -04: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
Fox-McCloud
7165360832 Blood Refactor+Fixes 2016-07-10 02:58:00 -04:00
Fox-McCloud
e0b50cd87a tweak 2016-07-09 22:21:28 -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
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
edda2a8cfc operator_changes 2016-07-08 13:37:29 -05:00
monster860
3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Chakirski
7b61546f98 Tabtest-tabtab-testtab 2016-07-08 01:16:51 -05:00
Fox-McCloud
9c3843092d fixes 2016-07-08 00:34:56 -04:00
Chakirski
2c259c4e22 Update component.dm 2016-07-07 23:13:24 -05:00
Chakirski
e789935c30 Update component.dm 2016-07-07 22:42:24 -05:00
Fox-McCloud
2e3d8bbbc6 Merge remote-tracking branch 'upstream/master' into hit-reactions 2016-07-07 22:50:53 -04:00
Chakirski
5e8c2599d1 What does the fox say? 2016-07-07 21:44:15 -05:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Fox McCloud
277c3216d1 Merge pull request #4797 from TheDZD/GENETICS-PLAYER-ANGRY-GENTICS-PLAYER-SMASH!!!
Re-Adds Instability
2016-07-07 22:26:58 -04:00
Fox-McCloud
14cfc90ff9 TG Hit Reaction Port+Armor Fixes 2016-07-07 21:17:03 -04:00
TheDZD
6998d795c5 Merge pull request #4883 from Fox-McCloud/pets
Allows You To Pet pAIs
2016-07-07 16:49:25 -04:00
Krausus
147d485cb3 Fixes alternate appearance clobbering 2016-07-07 16:25:46 -04:00
Chakirski
f61225f3b3 EMP-Binary 2016-07-07 15:05:33 -05:00
TheDZD
2df88fcdb5 Fixes and changes 2016-07-06 21:49:26 -04:00
Fox McCloud
7f5c764516 Merge pull request #4896 from Krausus/RuntimeFixes-20160705181950
Runtime Fixes
2016-07-05 23:45:15 -04:00
Krausus
b37cecbeae Fixes various runtimes (squashed)
- Fixes runtime in pod lock busters
- Fixes possessed object examination runtime
- Fixes runtime when following a destroyed mob
- Fixes to_chat runtimes from involuntary emotes
- Fixes runtimes from invalid clothing IDs
- Fixes runtime caused by wirecutting non-humans
- Fixes runtime when setting up malf AI antaghuds
- Fixes runtimes in sensory destruction reagents
- Fixes runtime caused by clientless ghosts
- Fixes antag hud runtime in autotraitor generation
- Fixes welding tool shutoff runtime
- Fixes runtime in laptops' welcome program
- Fixes to_chat runtime from mech sound effect
- Fixes runtimes in camera-using NanoUIs
- Fixes to_chat runtimes in resisting held mobs
- Fixes headless mob skeletonizing/husking runtimes
- Fixes non-mob add_logs runtime
2016-07-05 23:30:01 -04:00
KasparoVy
55b138ff57 kill more conflicts. 2016-07-05 21:48:27 -04:00
TheDZD
1a898dfd37 Merge pull request #4852 from FalseIncarnate/bug_fix
Minor Bug / Exploit Fixes
2016-07-05 20:41:47 -04:00
FalseIncarnate
d57c7c9ae4 Mind-preservation
transfers minds, rather than just keys, to ensure notes and such carry
over to new chickens.
2016-07-05 20:36:02 -04:00
Fox McCloud
df0c9e51cf Merge pull request #4870 from Kyep/specops_fix
Fixes NTSpecOps Radios
2016-07-05 20:00:21 -04:00
TheDZD
412d4cf501 Merge pull request #4866 from Fox-McCloud/flag-change
Minor Flag Refactor
2016-07-05 19:47:16 -04:00
Fox McCloud
fc54dd0dc7 Merge pull request #4862 from LittleBigKid2000/janiborg-enhancements
Changes the janiborg's mop into an advanced mop
2016-07-05 19:40:25 -04:00
Krausus
43ba8d56b7 Fixes simple animals sounding twice on hit
Playing the hitsound is handled in the object-based attack code, making
the simple animal-based hitsound redundant
2016-07-05 07:05:09 -04:00
Fox-McCloud
c53eb8607d Allows You To Pet pAIs 2016-07-05 04:15:51 -04:00
Fox McCloud
1fff3832b2 Merge pull request #4869 from Krausus/BorerFixes
Borer Fixes
2016-07-04 12:06:35 -04:00
KasparoVy
c8dca38b6b Vox Suit Revisions and adds Species Refit+Icon Override handling for Suit Collars 2016-07-04 06:12:10 -04:00
Kyep
1d24dc1b63 Fixes NTSpecOps Radios
- Changes NT Navy Officer / Special Ops Officer headsets to broadcast to
ERT radio by default, BUT also have the ability to talk to special ops
(deathsquad) radio by using .- (or #-, or #-).
- This fixes a bug where Special Ops Officers can't actually talk to
special ops teams because special ops teams are on a different frequency
to ERTs, and neither of the two channels (ERT or SpecOps) can be
selected with a :X/.X/#X style letter.
2016-07-04 02:52:49 -07:00
Krausus
32c5220f4c Borer fixes
- Fixes borers dying to environmental damage while inside a host.
- Fixes borers not releasing control of a host when it dies.
- Fixes borers being able to assume control of dead hosts.
- Fixes borers being able to talk to their host while dead.
- Fixes borers being told they can't leave their host while
incapacitated/dead, but then trying to leave it anyway.
- Removes an unused proc.
2016-07-04 02:45:49 -04:00