Commit Graph

6308 Commits

Author SHA1 Message Date
Mloc
c5cd3562e3 Merge pull request #3961 from Ccomp5950/loyaltyimplant_fix
Bugfix(2126) Traitors still have loyalty implants, admins should be able to remove/disable implants
2013-11-23 04:02:40 -08:00
Zuhayr
471c45471e Fixes #3927 2013-11-23 21:08:52 +10:30
Zuhayr
b476a55b47 Fixes #3967 2013-11-23 20:52:39 +10:30
Zuhayr
abd17deb5b Fixes #3962 2013-11-23 14:02:10 +10:30
Zuhayr
7cc1c93207 Clamps pill numbers between 1 and 20. 2013-11-23 13:47:20 +10:30
Zuhayr
85661195bc Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-11-23 13:20:15 +10:30
Ccomp5950
e00c6ae21e Bugfix: is_loyalty_implanted() now checks to make sure the implant is actually implanted and now in your hand.
implant adding via the traitor panel will also update it's location to be in the players head for autopsy as well as is_loyalty_implanted() reasons.

Thanks Chinsky / alex-gh for the heads up on this.
2013-11-22 12:52:25 -06:00
Zuhayr
f11b964f6c Fixes #3921 2013-11-22 23:10:06 +10:30
Ccomp5950
9ddbc905e9 Bugfix(2126) Traitors still have loyalty implants, admins should be able to remove/disable implants
Added a proc is_loyalty_implanted() that returns 1 if so, and 0 if not.

Added the ability to remove and add loyalty implants from the traitor panel.

Changed the checks on antags to not care if they are section heads, but to instead check for a loyalty implant.

Fixed a minor bug where traitorborgs made through traitor panel was not adding law 0

Adding a loyalty implant to an antagonist through traitor panel will also remove them from being an antag.
2013-11-22 01:12:56 -06:00
Ccomp5950
56a066ecfb Bugfix(3937) Blindfolds cause permenent blindness
Removed BLIND vision flag from the object as that is already handled in mob/living/carbon/human/life.dm

Resolves #3937
2013-11-21 21:35:23 -06:00
ZekeSulastin
2a95cdd296 Scalpels also mangle gloves for nonhuman wear. 2013-11-20 17:07:05 -05:00
Chinsky
48c35d0f8f Merge pull request #3938 from Ccomp5950/master
Admin request:  Jobbans for IA and ERT
2013-11-20 10:27:36 -08:00
Ccomp5950
457835db38 Admin request: Jobbans for IA and ERT 2013-11-17 18:16:42 -06:00
Nanai
ab06251c32 Event Rebalance!
As per request, events have been rebalanced to be a bit more even and vastly less appendicitis. Event timers have been increased from 15-25 minutes to 20-40 minutes.
2013-11-16 02:09:28 -05:00
Chinsky
3aa7f498b3 Merge pull request #3920 from Kilakk/master
Fixes #3886, ATMs no longer log you in automagically
2013-11-15 01:55:29 -08:00
Ccomp5950
734d89c669 BugFix: Cult Ghosts...after a bit of professional advise from chinsky.
Problem:  Cult members can't use the rune to see ghosts, then beat ghosts over the head.  it was being intercepted by _onclick and processed there and only displaying an angry red notice
that you hit that ghost.  Ghost didn't become visible, it disappeared soon after moving off the rune.

Solution:  Made an attackby for ghosts to check when they are being beat up by cultist with books, now they appear.

Minor feature change:  Now if a visible ghost gets hit it will give a different message than the standard "Ghost is pulled through from the other side".
2013-11-15 01:00:25 -06:00
Kilakk
99321389f2 Fixes #3886, ATMs no longer log you in automagically
Silly security level 0 ruined everything
Added a tiny sanity check as well to avoid runtimes
2013-11-14 21:45:25 -05:00
LightningIron
b5671e8bd8 Surgery grammar fixes 2013-11-10 13:08:44 -06:00
Mloc
6f19999a9c Merge pull request #3897 from comma/organstuff
Minor organ optimizations
2013-11-08 05:44:24 -08:00
Chinsky
d1be0cba0b Healing wounds should properly update damage overlay if needed. 2013-11-08 08:10:50 +04:00
Chinsky
3992888ea6 removed some unneeded icon update calls (haha totally unneeded yeah)
replaced complete regenerate_icons with just body_update in case of dropping limb
2013-11-08 04:34:37 +04:00
Chinsky
04237f47cb Merge pull request #3894 from DJSnapshot/master
Fix for fire alarms in Mining and Research Outpost
2013-11-07 16:27:38 -08:00
Chinsky
6d369caae7 Replaces long check with lots of get_organ calls with shorter one.
Also changed weird condition that amputated leg must not be splinted.
Removed checks for haslimbs, since movement while downed is not possible anyway.
Moved some special effects for broken limbs after check for such, so healthy ones wont bother.

Fixed a derp in populating the global list of sideffects.
2013-11-08 04:15:49 +04:00
DJSnapshot
7c59c41b13 Fix for fire alarms in Mining and Research outpost so they actually will change status depending on the alert level of the station. 2013-11-07 16:02:57 -08:00
Kilakk
ee34d281f9 Fixes #3890, gave Aloe a more reasonable boozepwr 2013-11-07 18:54:42 -05:00
Mloc
2eb98fd86e Merge pull request #3879 from comma/master
derp
2013-11-04 15:18:50 -08:00
Chinsky
5df1b3c0d4 derp 2013-11-05 03:17:44 +04:00
Mloc
68f796b572 Merge pull request #3874 from comma/master
Some virus fixes
2013-11-04 13:15:40 -08:00
Chinsky
40e862fe00 GC's virus dummies #whoa #derp 2013-11-05 01:13:49 +04:00
DJSnapshot
c20c84b328 Dun goofed 2013-11-04 13:10:33 -08:00
Chinsky
3a425c6095 Another uncommented log debug line. 2013-11-05 01:08:31 +04:00
DJSnapshot
15a2bcc54f Fix so bans can work again. 2013-11-04 13:07:03 -08:00
Chinsky
8c69e3d8b7 derp 2013-11-04 05:53:10 +04:00
Mloc
7fdcf3deee Merge pull request #3866 from comma/master
Itty bitty antilag bits.
2013-11-03 17:21:20 -08:00
Chinsky
6402581595 Itty bitty antilag bits.
-If wound disappears, do not process it.
-Moved reagents checks so they are only done when wound is internal. They have no effects on non-internal wounds anyway.
-Calling update_body only when losing limbs, other times UpdateDamageIcon(] is right proc
2013-11-04 05:16:04 +04:00
DJSnapshot
231131c1f5 Merge pull request #3814 from Baystation12/dev-freeze
0.1.5 merge.
2013-11-03 14:02:16 -08:00
DJSnapshot
11f0b1ef92 Fixed delay so anyone with R_SERVER can use it. 2013-11-03 13:31:54 -08:00
DJSnapshot
63fb3f29ea mecha fixes 2013-11-02 12:26:34 -07:00
Segrain
7ffafb657e Fix for acid pouring. 2013-10-27 21:56:08 +03:00
Segrain
93cfba21a7 Fix for #3826. 2013-10-27 21:55:08 +03:00
Kilakk
91e440e26c Fixes #3801, C4 will no longer destroy the analyzer it's inside of
Committed to dev-freeze because the fix doesn't work with the click code on master
2013-10-27 00:42:11 -04:00
Segrain
6cf485deae Quickfix. 2013-10-24 19:13:05 +03:00
Segrain
c8fcabc181 Smallfix. 2013-10-24 19:11:04 +03:00
Segrain
d8f0c43be1 Merge remote-tracking branch 'upstream/master' into dev-freeze 2013-10-24 19:02:56 +03:00
Segrain
5698addc75 Code cleanup. 2013-10-24 09:54:15 +03:00
Chinsky
74f898a1a2 Merge pull request #3809 from DJSnapshot/antag
Fix for sunglasses and Night Vision Goggles
2013-10-23 21:58:44 -07:00
DJSnapshot
5f7ee54430 Fix for sunglasses and night vision goggles 2013-10-23 19:51:01 -07:00
Chinsky
1488850ad1 Merge pull request #3803 from Nanai/dev
Drinks Pack/Spritefixes and Vending Machine Loadout
2013-10-21 04:30:15 -07:00
Nanai
50f2f0ae46 Removes pin necessity on vending machines. 2013-10-21 07:12:23 -04:00
Nanai
4c01ecaee4 Fixed iced tea, adds canned ice tea and grape juice, adds grape juice, melon liquor, blue curacao, grenadine, poisonous wine. rebalances absinthe, and places it within the vendor. 2013-10-21 07:11:40 -04:00