Commit Graph

1924 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
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
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
c925e8019e Merge pull request #8802 from Zelacks/defibModify
Removes the minimum damage requirement for defibs
2015-04-11 15:26:05 +02: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
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
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
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
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
norill
73e4502a64 outer +/- hrefs in tank pressure gui change pressure by 5kPa instead of 10 now 2015-04-08 00:00:39 +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
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
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
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
Jordie
6d34032385 Merge pull request #8628 from Fayrik/AllTheSmallThings
Someone called for pest control?
2015-04-04 20:58:07 +11:00
Jordie
8d2f92cdd3 Merge pull request #8683 from AnturK/pickets
Adds Picket Signs
2015-04-04 20:57:56 +11:00
Jordie
20ed6aada5 Merge pull request #8668 from ACCount12/syndieboxes
Toolboxes & welders update
2015-04-04 20:57:15 +11:00
Orange Borg
09c102cf9a Update stunbaton.dm 2015-04-04 16:09:15 +13:00
Orange Borg
de16628204 stun batons no longer lose charge over time 2015-04-04 16:06:59 +13:00
phil235
493c3e038a Splitting food.dmi into smaller files.
Repathing meat slab, meatsteaks and cutlets into meat/slab, meat/steak, meat/rawcutlet, meat/cutlet. Fixes issue with food naming when containing meat stuff, especially human meat.
Bowl filled with reagent now gets a nice half transparent overlay with the reagents colors (like beaker)
Mousedroping a snack that's on a table now opens the tablecrafting window.
Fixes not being to store items in plain bread, plain cake and cheesewheel.
2015-04-03 21:59:56 +02:00
Artur
3ff5980e85 - Adds Picket Signs 2015-04-02 18:23:17 +02:00
Jordie
57e1274353 Merge pull request #8624 from Cheridan/day42_betsoff
Day Who-Knows: Bar Gambling Expansion!
2015-04-02 20:15:18 +11:00
ACCount12
cda61c1075 Welder&toolboxes update 2015-04-01 10:43:22 +12:00
ACCount12
f10d0df8cf Merge remote-tracking branch 'origin/master' into mining 2015-03-31 18:31:12 +12:00
ACCount12
1c219f0ebe A lot of stuff 2015-03-31 18:30:09 +12:00
Cheridan
9606763e5f Merge pull request #8583 from Fayrik/CentcomExpansion
Centcom Two: It's better now, I swear.
2015-03-30 21:35:19 -05:00
phil235
0cef9e5539 Merge pull request #8198 from Xhuis/cigar_cases
Adds cigar cases
2015-03-30 18:47:46 +02:00
Fayrik
9b834fca7a Look at all these bugs that no longer exist! 2015-03-30 03:36:24 +01:00
Cheridan
884e9e3774 Day Who-Knows: Bar Gambling Expansion!
Space cash is stacks
Adds dealer table to map
2015-03-29 18:09:54 -05:00
Jordie
8113c2a1f0 Merge pull request #8483 from xxalpha/c4fix
Fixes the C4 being planted on the DA.
2015-03-30 01:21:52 +11:00
Jordie
c8e0c16d09 Merge pull request #8520 from MrPerson/effect_cleanup
Effect pooling
2015-03-30 01:21:40 +11:00
Fayrik
7336e6ecb8 Call Centcom! ERTs got fixed! 2015-03-29 03:54:54 +01:00
xxalpha
55b81363cc Merge remote-tracking branch 'upstream/master' into hardjet
Conflicts:
	code/modules/clothing/spacesuits/hardsuit.dm
2015-03-27 19:35:10 +00:00
Cheridan
17067d9021 Merge pull request #8508 from phil235/SlimeAnimal
Life refactor and slime as animal
2015-03-27 13:38:16 -05:00
Jordie0608
1fc89cb611 removes soh singulo interaction 2015-03-26 13:19:56 +11:00