Commit Graph

22204 Commits

Author SHA1 Message Date
Fox McCloud
bf07402fb9 Merge pull request #4948 from TullyBurnalot/DroneFix
Drone AntagHUD Fix
2016-07-09 18:55:39 -04:00
Fox McCloud
f20ac43730 Merge pull request #4909 from TullyBurnalot/PAEPERVERK
Admin Fax Template Flair
2016-07-09 18:54:32 -04:00
Fox McCloud
7ca21d2f91 Merge pull request #4953 from Krausus/JobBanRefactor
Job Ban Check Refactor
2016-07-09 18:36:41 -04:00
Fox McCloud
443e530f08 Merge pull request #4923 from TullyBurnalot/PhotocopyEmag
Photocopier Emagging and Toast
2016-07-09 18:32:55 -04:00
Fox McCloud
a8d010360c Merge pull request #4946 from TullyBurnalot/RevenantFix
Revenant Death Fix
2016-07-09 18:31:39 -04:00
Fox McCloud
276160ef8f Merge pull request #4928 from TullyBurnalot/Monocle!
Prescription Monocles
2016-07-09 18:31:16 -04:00
TheDZD
04d5219d6a Merge pull request #4929 from Fox-McCloud/hit-reactions
Hit reactions
2016-07-09 18:30:37 -04:00
Fox McCloud
c98ba8de79 Merge pull request #4925 from TheDZD/no-looking-back-no-regrets
The Honkening
2016-07-09 18:29:11 -04:00
Fox-McCloud
6a45502dd9 proper RD armor 2016-07-09 18:18:52 -04:00
TullyBurnalot
36e9f46c0f Fixed typo in "proffesionalism"
IRONY
2016-07-09 17:25:58 +01:00
TullyBurnalot
78547e275a - Added two more fax templates
- Added "Keep up the good work" template
- Added "ERT Instructions" template
2016-07-09 16:38:14 +01:00
TheDZD
a144980bde Minor tweaks 2016-07-09 11:37:26 -04:00
Krausus
918ed392bd Job ban refactors/fixes 2016-07-09 06:05:07 -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
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
TullyBurnalot
9775cf9ec4 Revenants can die now
- Removed "You can't die if you just died" insanity
2016-07-09 03:49:47 +01:00
Fox McCloud
d9c86e24ed Merge pull request #4922 from FalseIncarnate/kitchen
Buildable Deep Fryers
2016-07-08 21:19:02 -04:00
Tastyfish
37d2721c76 Makes healthdoll immediately update upon being hit 2016-07-08 19:28:07 -04:00
Fox McCloud
33c4d852f8 Merge pull request #4904 from TullyBurnalot/CardboardCoffins
Resisting out of cardboard boxes is now possible
2016-07-08 18:24:18 -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
Fox McCloud
ec40944987 Merge pull request #4921 from Chakirski/green-glasses
Prescription Upgrade to Green Glasses & Syndi-Mesons
2016-07-08 18:00:27 -04:00
Fox McCloud
4f8de18cb9 Merge pull request #4936 from Twinmold93/materialconsistencies
Grille  Inconsistency Fix
2016-07-08 17:59:23 -04:00
Fox McCloud
f8c6b8da38 Merge pull request #4942 from TullyBurnalot/RevolverSpin
Revolver Spinny Noisey-boo
2016-07-08 15:08:43 -04:00
Chakirski
edda2a8cfc operator_changes 2016-07-08 13:37:29 -05:00
TullyBurnalot
b79429ca8a Fixes Revolver Sound
- Spinning revolvers now produces a sound.
2016-07-08 19:20:33 +01:00
Fox McCloud
4897a52dc5 Merge pull request #4926 from TullyBurnalot/ComfyChair
Fixes Comfy Chair Deconstruction
2016-07-08 13:14:51 -04:00
TullyBurnalot
e0118efead Fixed Fox's suggestion
- Removed needless code
2016-07-08 12:03:38 +01:00
Twinmold
cd7ffd058b Grille Inconsistency Fix
This fixes an inconsistency when you use wirecutters on a destroyed
grille. Instead of giving 1 like it should, it gives two.

🆑 Twinmold
Fix: Fixes the inconsistency of getting 2 metal rods when you wirecutter
a destroyed grille down to 1.
/🆑
2016-07-08 03:29:16 -05:00
Chakirski
7b61546f98 Tabtest-tabtab-testtab 2016-07-08 01:16:51 -05:00
Fox McCloud
0c9965abf8 Merge pull request #4927 from TullyBurnalot/BawksInBawks
Fourth-Dimensional Box Tesseract Fix
2016-07-08 01:24:32 -04:00
FalseIncarnate
2b77c45694 Merge conflict fix 2016-07-08 00:46:46 -04: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
TullyBurnalot
9821a7f757 Prescription Monocles
- Makes monocle prescription upgradable
- Adds monocles to Loadout options
2016-07-08 03:59:25 +01: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
Fox-McCloud
17be7813b8 shielded hardsuits 2016-07-07 22:39:40 -04:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
TullyBurnalot
edc7b921ff Fixes boxes in evidence bags in boxes
- Boxes no longer allowed inside evidence bags
2016-07-08 03:28:58 +01: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
d0687d3354 Merge pull request #4907 from TullyBurnalot/BotanistAccess
Revoked Botanist Access to Morgue
2016-07-07 22:14:56 -04:00
TullyBurnalot
0b94dc3a54 Fied Tiger's recommendations
- Removed needles src. Again.
- Replaced  istype(W, /obj/item/weapon/wrench) with iswrench(W)
2016-07-08 03:03:37 +01:00
TheDZD
9cfb3dc644 Overeating is bad for you 2016-07-07 21:58:34 -04:00
TullyBurnalot
adab2c06e0 Fixes Comfy Chair Deconstruction
- Deconstructing Comfy Chairs now yields 2 metal sheets
2016-07-08 02:49:15 +01:00
TheDZD
52e6df894e The Honkening 2016-07-07 21:35:19 -04:00
TullyBurnalot
65edca1010 Adds spaces
- Adds spaces in to_chat(H)
2016-07-08 02:19:25 +01:00
Fox-McCloud
14cfc90ff9 TG Hit Reaction Port+Armor Fixes 2016-07-07 21:17:03 -04:00