76ee0a3e1a
Fixes typo in a slaughter demon message.
...
Fixes slaughter demon icon upon being admin healed/revived.
Add the limit var to datum/spellbook_entry to limit the amount of times it can be bought by the wizard. It's currently only used to limit wizard from summoning more than 3 slaughter demons.
2015-07-17 21:36:58 +02:00
4eedf27627
Makes SWAT helmets space-proof again.
2015-07-17 14:59:47 -04:00
e2d76a0116
Fixes drone and cyborg not being affected by mounted flashers.
...
Remove eye stat damage from flashbang's bang() proc (eye damage is already handled in carbon/flash_eyes())
Changed many flash producing effect to affect all carbons instead of only humans.
The experimental weldingtool now produces less light than regular welding tool and can be used safely with only sunglasses.
2015-07-17 17:12:16 +02:00
94d8e5d9a4
-First revision of the wumborian fugu mob
...
-Nerfs collapse emote, causes stamina damage to yourself now
-Minor fixes with aggro() for mobs
2015-07-16 23:46:46 -07:00
5aad09d638
Fixed night vision spell not working.
2015-07-17 05:49:35 +01:00
d72cbcaf2f
- fixes handcuff overlay on monkey not showing.
...
- Fixes the lack of handcuff icon on the hand screen object for alien humanoids..
- fix legcuff overlay not showing on monkey.
- fixes fire overlay for monkey, aliens and cyborg, no longer looks human shaped.
- Made the regenerate_icons's subprocs at the carbon level more OOP.
2015-07-17 01:15:21 +02:00
ed1d1c1919
Merge pull request #10620 from AnturK/mimic_fixes
...
Morph Fixes
2015-07-17 00:27:59 +02:00
f1a2385443
Morph Fixes
2015-07-16 21:50:11 +02:00
2c3db425fa
Resolve merge conflict, step 1.
2015-07-16 12:35:58 -07:00
0f37ac3c14
Merge pull request #10601 from xxalpha/nightmaregoggles
...
Fixed t-ray goggles not updating pipes&cables correctly.
2015-07-16 19:52:22 +02:00
3537d754b3
Merge pull request #10345 from Steelpoint/HoSArm
...
[BALANCE] HoS/ERT/DS Armour Buff | Revolver Armour Piercing
2015-07-16 11:29:22 -04:00
a93dde3034
Merge pull request #10384 from Steelpoint/GasMask
...
[BALANCE] Reduces Weight Size of Sechailer Gas Mask
2015-07-16 11:25:13 -04:00
236215b03c
Fixes damp rag smothering
2015-07-16 17:20:08 +02:00
87cea3c58c
Fixes buckled drones dropping the stuff they're holding in their hands.
2015-07-16 16:44:42 +02:00
3a93eeabba
Merge branch 'master' of https://github.com/tgstation/-tg-station into DrinkingGlassPourFix
...
Conflicts:
code/game/jobs/job/cargo_service.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/job.dm
2015-07-16 14:19:29 +02:00
7f5b01c932
Derp
2015-07-16 14:14:52 +02:00
3e9ab4e3c1
Merge branch 'master' of https://github.com/tgstation/-tg-station into SmokeFoamBuff
...
Conflicts:
code/ATMOSPHERICS/atmospherics.dm
code/__HELPERS/unsorted.dm
code/game/objects/items/weapons/tanks/watertank.dm
code/modules/reagents/Chemistry-Recipes.dm
2015-07-16 14:09:12 +02:00
34db8dd695
Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
...
Conflicts:
code/game/mecha/equipment/mecha_equipment.dm
code/game/mecha/equipment/tools/medical_tools.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/equipment/weapons/weapons.dm
code/game/mecha/mecha.dm
2015-07-16 13:50:01 +02:00
e968c9e03c
Fixes dog bed dropping metal on deconstruction.
...
Fixes damp rag smothering not giving a bold red message to the victim.
Fixes curare not properly weakening mobs.
2015-07-16 13:04:44 +02:00
e985aa05d3
Merge branch 'master' of https://github.com/tgstation/-tg-station into thisalsomeansammoleftcannowbecalculatedasafactorofoverlayslength
...
Conflicts:
code/modules/projectiles/guns/energy/temperature.dm
2015-07-16 21:02:50 +10:00
8c2519e115
merge conflicts
2015-07-16 04:54:11 -06:00
ae417d2a03
Merge branch 'master' of https://github.com/tgstation/-tg-station into atmosrefactor2
...
Conflicts:
code/ATMOSPHERICS/atmospherics.dm
code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
code/ATMOSPHERICS/components/binary_devices/pump.dm
code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
code/ATMOSPHERICS/components/trinary_devices/filter.dm
code/ATMOSPHERICS/components/trinary_devices/mixer.dm
code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
code/ATMOSPHERICS/components/unary_devices/Freezer.dm
code/ATMOSPHERICS/components/unary_devices/cryo.dm
code/ATMOSPHERICS/components/unary_devices/unary_base.dm
code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
code/modules/events/vent_clog.dm
code/modules/mob/living/carbon/human/species.dm
config/admins.txt
2015-07-16 04:27:25 -06:00
2693a44a80
Buffs Lightning Bolt
2015-07-16 10:57:08 +02:00
867b43a5a3
re-adds the black/red striped variant for fluke ops. also hunke.
2015-07-16 00:48:42 -04:00
d372bae224
I did it backwards help
2015-07-15 18:03:12 -05:00
d193fe7bac
Changes var name
2015-07-15 18:02:15 -05:00
1994070b3b
Changes
2015-07-15 17:59:50 -05:00
7c5a90c5e9
Fixes sounds cutting out
2015-07-15 17:35:15 -05:00
7b546709b9
removes any source of connection between nanotrasen and syn- i mean removes possible conspiracy theories caused by stolen nanotrasen equipment.
2015-07-15 18:11:32 -04:00
4688c2c969
Fixes proc arguments
2015-07-15 23:52:35 +02:00
5a78777daf
Changed carbon/clean_blood() to carbon/human/clean_blood() and moved it from carbon.dm to human.dm since it only did stuff for humans.
...
Fixes showers not being processed correctly, especially for mobs. (processing will a bit more intensive unfortunately)
Fixes showers not cleaning bloody human hands.
Remove the now unused checkeyes() proc.
2015-07-15 19:49:23 +02:00
ce101208a9
Fixes Satchel preference not working.
...
Also some simplification of the equip_backpack() proc.
2015-07-15 17:38:03 +02:00
76ad07805c
Changes up the Bulldog Bioterror Dart
2015-07-15 06:28:16 -07:00
33a8b288c8
haha wow totally forgot a tab
2015-07-15 06:24:40 -07:00
1e7ded7e81
Buffs the Bioterror Chem Sprayer
...
The Bioterror Chem Sprayer is a fun idea on paper, but the reagents in it are kinda shit. It's one of the least bought items because it's pretty useless.
It now has the following reagents:
Sodium Thiopental, for stamina and knockout
Coniine, for Toxin and Oxygen
Venom, for scaling Toxin, Brute, and Histamine Decay
Condensed Capsaicin, for an instant stun on application
Initropidril, for the heart attacks
Polonium, for the severe radiation
All in all, this should make the Bioterror sprayer actually worth the points investment, and make it more fun to use as an operative.
2015-07-15 06:18:46 -07:00
055a03b760
Fixes not being able to pour from a glass into a beaker when holding both in your hands.
2015-07-15 15:10:21 +02:00
9c0ef0c2ce
overlays for energy guns
2015-07-15 19:06:48 +10:00
d31d1a017a
Adds emag/emp effects, makes AAS fully constructable, adds a circuitboard for the AAS, and adds overlays for announcements/errors.
2015-07-14 20:34:53 -07:00
4207de5159
Fixes a typo
2015-07-14 23:22:23 -04:00
493fcf44c1
Moves AAS to /obj/machinery, adds power usage, deconstruction(/construction?) and new sprite.
2015-07-14 17:33:37 -07:00
1f7fa1aff1
Upgrades to variable lighting system + Sprites
...
- Moved to a variable lighting system with five lighting levels
- Added sprites for brightly lit borgies, and for the buttons by xxalpha
- Added a power drain system
- Removed a now obsolete check for flashlight item in borg inventories.
2015-07-14 16:17:58 -05:00
49f55d312a
Merge pull request #10545 from Miauw62/whyareallsecborgsshitlers
...
Adds a huge message to sec borgs telling them not to be shitheads.
2015-07-14 15:14:16 +02:00
4763427154
Merge pull request #10559 from Ergovisavi/mediborg_annoyances
...
Makes the Mediborg Hypospray attack_self() behave like the Cyborg Shaker
2015-07-14 15:11:00 +02:00
1265d49b7c
Merge pull request #10470 from Jordie0608/spessmensfourthwallistheceiling
...
Fixes ooc autotoggle and adds loc to sprayer log
2015-07-14 14:45:47 +02:00
4c859a9ef7
Merge pull request #10497 from AnturK/bagoffixes
...
Fixes teleport-swap
2015-07-14 14:30:05 +02:00
3ca900575e
Merge pull request #10489 from Shadowlight213/BraindeadAI
...
Adds an examine message to braindead Ais
2015-07-14 00:33:51 -05:00
b284e44df4
Merge pull request #10425 from Jordie0608/ss13willbenarratedbyLemonySnicket
...
Local narrate verb
2015-07-13 23:48:30 -05:00
c56a445037
Merge pull request #10580 from Ikarrus/bombarmor
...
Clothing with bomb armor are less likely to be shredded
2015-07-13 21:37:09 -05:00
8a2ad87694
Lings now get to see the last 8 messages the person they absorbed said, to allow for better impersonations.
2015-07-14 03:20:39 +01:00
85e64ae7e0
Adds some more messages for braindamage gibbering
2015-07-14 13:18:40 +12:00
phil235
MMMiracles
Ergovisavi
xxalpha
phil235
AnturK
Chiefwaffles
WJohn
Jordie0608
duncathan
KorPhaeron
Firecage
Iamgoofball
Xhuis
GunHog
Cheridan
Remie Richards
oranges