Commit Graph

2924 Commits

Author SHA1 Message Date
Cheridan
87edea4eab Merge pull request #8969 from phil235/BundleFix2
Another bundle of fixes
2015-04-15 21:08:13 -05:00
Swag McYolosteinen
36cac2405d Merge pull request #8932 from Iamgoofball/patch-56
Fixes incendiary grenades
2015-04-15 13:03:03 +02:00
Cheridan
26a974a8c3 Merge pull request #8943 from MrPerson/ied_fixes
IED fixes
2015-04-14 19:40:50 -05:00
phil235
2ed906b990 Fixes inhand sprites for eggs.
Fixes heart underwear sprite being too big.
Fixes being able to push a janicart through plastic flaps.
Fixes ERT medic closet starting with a combat defib with no cell. Empty combat defib can now get a cell inserted.
Fixes inconsistency in nukeop pinpointer upon activation, it now says standard pinpointer message plus the current mode (shuttle or disk).
2015-04-14 17:41:36 +02:00
Xhuis
87541dabc2 Progress 2015-04-13 19:12:29 -04:00
MrPerson
0a6fb70137 IED fixes
Fixes #8919 - can pixel_x/pixel_y is inherited by the IED after construction
Fixes an unreported issue where the can underlay of IED's would be rendered underneath your HUD when it was in your hands.
2015-04-13 07:00:19 -07:00
Jordie
d8ef9ecb44 Merge pull request #8777 from CosmicScientist/SpaceCarpTatorItem
Adds space carp traitor item and carp plushie "attack"
2015-04-13 18:22:53 +10:00
Iamgoofball
0dd03a7201 you didn't see anything 2015-04-12 19:13:24 -07:00
Iamgoofball
18207ae363 Fixes incendiary grenades 2015-04-12 18:02:22 -07:00
Cheridan
141d577bba Merge pull request #8895 from phil235/WindowFix
Windows, CPR, lipstick fixes
2015-04-12 13:06:42 -05:00
Swag McYolosteinen
ffd0db2b7b Merge pull request #8581 from MrPerson/lighting_2015
Object based lighting system
2015-04-12 13:14:32 +02:00
Jordie
dc3cc0295a Merge pull request #8887 from sawu-tg/spray2
Fixes Spraycans bugs
2015-04-12 13:44:36 +10:00
phil235
5f169e8e47 Remove SpeciesCanConsume() proc, replaced by iscarbon checks.
Remove alloweat var from masks, remove MASKCOVERSMOUTH flag from mime and clown masks so you can still eat through them.

Some adjustments in surgery checks for bodyparts covered.
Fixes a runtime in weapon/energy attack_verb.

Humans can now CPR monkeys.
Slight changes to CPR code.
Fixes runtime with drones trying to do CPR.

Rewrites /obj/item/weapon/reagent_containers/proc/canconsume to be less shitty.

Adds an is_mouth_covered() proc to carbons to check for mask and headgear with MASKCOVERSMOUTH or HEADCOVERSMOUTH, with argument to restrict the check to only mask or only head.
2015-04-11 22:16:42 +02:00
phil235
6996897b65 Fixes fulltile windows not spawning the correct amounts of shards and rods.
Fixes broken grille not dropping a rod when shot with buckshots.
2015-04-11 17:41:09 +02:00
CosmicScientist
075328fa62 Merge branch 'master' of https://github.com/tgstation/-tg-station into SpaceCarpTatorItem 2015-04-11 14:40:35 +01:00
CosmicScientist
bfbc7c40a8 Should be up to date now. 2015-04-11 14:39:37 +01:00
phil235
c925e8019e Merge pull request #8802 from Zelacks/defibModify
Removes the minimum damage requirement for defibs
2015-04-11 15:26:05 +02:00
Sawu
850673c684 Fixes Spraycans bugs
* Fixes Spraycans being used at a range
* Fixes Spraycans not consuming ammo when used as a stun.
* Changes the stun mechanic, so people with eye protection are only blinded, without it they are stunned fully.
2015-04-11 14:27:25 +10:00
CosmicScientist
0e0f8c4720 Fixed code, carp won't attack owner, corrected spelling. 2015-04-11 03:48:08 +01:00
Cheridan
a4ad75c91f Merge pull request #8815 from norill/tank_gui
Tank GUI buttons change pressure by +-5 instead of 10
2015-04-10 14:29:21 -05:00
Cheridan
69f1b38479 Merge pull request #8838 from optimumtact/hearmeroar
Fix megaphone having an audible range of one
2015-04-10 01:01:57 -05:00
phil235
4ef5aa93dc Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
Conflicts:
	icons/obj/food.dmi
2015-04-09 17:38:14 +02:00
phil235
ddb5ffe324 Merge pull request #8582 from Xhuis/two_devices
Adds pizza bomb
2015-04-09 12:58:57 +02:00
phil235
b4616ad09b Merge pull request #8731 from optimumtact/patch-2
stun batons no longer lose charge over time
2015-04-09 12:51:40 +02:00
Cheridan
e170ee88ce Merge pull request #8804 from AnturK/signsdelay
Adds delay to picket sign waving
2015-04-09 00:26:08 -05:00
Cheridan
58a362b2f1 Merge pull request #8822 from sawu-tg/blackface
Fixes Spraycans not coloring faces correctly (and changes up lipstick)
2015-04-09 00:20:23 -05:00
oranges
8a5696a033 Fix megaphone having an audible range of one 2015-04-09 10:57:30 +12:00
phil235
939b5552ad Merge pull request #8534 from Jordie0608/allgoodideasstartwithamistake
Fixes #8529, confirmation check for BoH bombing
2015-04-08 20:01:35 +02:00
phil235
e6e0143ec5 Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/MiniStation/z2.dmm
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
2015-04-08 19:36:49 +02:00
AnturK
0685e87341 - Adds delay to picket signs 2015-04-08 16:21:19 +02:00
Cheridan
c5f6f5ff2c Merge pull request #8812 from Jalleo/Removal
Removal of empty file
2015-04-08 08:44:43 -05:00
Cheridan
f537b43108 Merge pull request #8789 from phil235/BeartrapFix
Pull, resist, beartraps
2015-04-08 08:38:01 -05:00
Jordie0608
ad33641101 Merge branch 'master' of https://github.com/tgstation/-tg-station into howdoyouknowyourbestfriendisntsecretlyawizard
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
	icons/obj/closet.dmi
2015-04-08 22:51:45 +10:00
Jordie0608
37277f66e7 pre-map compile 2015-04-08 15:40:41 +10:00
Sawu
6103b2a5e1 Fixes Spraycans not coloring faces correctly
* Changes Spraycans and lipstick to use a fully tintable overlay.
* Lipstick now comes in more colors and (codewise) can be changed with one var.
* Spraycans now color the face overlay correctly, racism for everyone!
2015-04-08 15:02:32 +10:00
Xhuis
2cb387af90 Adds proximity/stat/etc. check and removes bloat 2015-04-07 19:52:14 -04:00
norill
73e4502a64 outer +/- hrefs in tank pressure gui change pressure by 5kPa instead of 10 now 2015-04-08 00:00:39 +02:00
phil235
6b83575b28 Merge branch 'master' of https://github.com/tgstation/-tg-station into BeartrapFix
Conflicts:
	code/modules/mob/living/living.dm
2015-04-07 20:27:37 +02:00
blah
af99eea983 okay 2015-04-07 18:57:30 +01:00
Zelacks
cb6bae5e52 -Defibs no longer have a minimum damage requirement. Previously the body required to be damaged in order to be defibbed (Required to be damaged, atleast 200 units). I can only assume that this was the case because the author had math that needed the body to have atleast 200 units of damage for it to work correctly, but I assume that the author naively thought it was impossible to heal corpses.
--Defibs now restore the health of the user to halfway between crit and death (-50 health or 150 sustained damage). If the user has little damage sustained, they will receive oxyloss to place them to the halfway point. If the corpse has more damage than the halfway point, they will be healed to the halfway point, in a ratio based on how much they sustained in each type of damage they took.
--Defibs will not heal cloneloss, and will still damage/heal the patient to the halfway point including the cloneless (eg a patient who is 0/0/0/0 with 30 cloneless receives 120 oxyloss). If the patient has too much cloneloss, they will heal fully, except they will still have the cloneloss (eg, they will be 0/0/0/0 with 180 cloneloss on revival)
--Additonal feedback given for some failure states for the defib.
2015-04-07 18:28:32 +08:00
phil235
8499413649 Makes living/verb/resist more object oriented.
Adds a fourth mob size "MOB_SIZE_TINY" to differentiate corgi size and mouse size. (used in bear trap code)
Rewrites beartrap/Crossed() to have less istype checks.
Adds a flying var to simple animals (used in bear trap code)
Makes pulling update in living/life.dm() to fix pulling not stopping when you're incapacitated.
2015-04-06 18:45:37 +02:00
Cheridan
062d0c2086 Merge pull request #8759 from optimumtact/patch-3
Fix can_speak check in megaphone
2015-04-06 08:48:49 -05:00
Cheridan
1da595b535 Merge pull request #8737 from RemieRichards/NinjaCleanup2
A restructure/removal/cleanup of Ninja Code [Part 2] - Abilities and stuff
2015-04-05 21:54:33 -05:00
CosmicScientist
13060bb6f4 Adds space carp traitor item and fun for carp plushie. 2015-04-06 02:04:16 +01:00
Xhuis
27625530e3 Kenny Loggins 2015-04-05 19:13:23 -04:00
phil235
cbbd5897ee Fixes typos, rice pudding recipe changed, maxvolume and bitesize for superbiteburger and stew changed, cookbook updated. 2015-04-05 16:48:50 +02:00
Orange Borg
a5306ba1e0 Fix can_speak check in megaphone
The original check actually made no sense, but worked because it returned false every time as there was never a message passed through
2015-04-05 20:29:07 +12:00
phil235
6550016ee6 Merge pull request #8723 from kingofkosmos/grammarfixes
Recieve --> Receive
2015-04-04 20:00:21 +02:00
phil235
f9f618d699 Adding the chemical reactions and recipes for the new recipes.
Changes the glasses of what? to use an overlay with reagents color.
Adding a ricepack to the kitchen cabinet and the food crate.
Adding more bowl to the dinnerware vending machine.
Adding pumpkinjuice, blumpkingjuice, cherryshake, bluecherryshake pumpkin latte, drunken blumpkin reagents.
2015-04-04 19:29:12 +02:00
Remie Richards
5e93f57873 Fixes energy katana emag spam. Fixes energy nets not anchoring their target. Fixes runtime from upgrading suit cell. Ninja stars ability changed to summon one obj/item/weapon/throwing_star/ninja with throw mode auto toggle on for instant throwing. Added ninja sword recall, Allowing the ninja to recall their sword back to themselves, if they can see the sword the ability is free, and the sword throws itself towards the ninja, hitting people as it does so. 2015-04-04 18:17:37 +01:00