Commit Graph

4799 Commits

Author SHA1 Message Date
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
hornygranny
e957233907 Merge pull request #8772 from MrPerson/foam_fixarooney
Fixes cleaner grenades
2015-04-06 16:09:35 -07:00
phil235
1f6a6b0e8c Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienIconUpdateFix
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
2015-04-06 19:38:51 +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
MrPerson
94c0c1598d Fixes cleaner grenades
Fixes #8757
Default for locate is "in world"!
2015-04-05 16:55:17 -07: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
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
6d4f3b60f8 Merge pull request #8663 from dannno/sadclown
sad trombone for clown pda
2015-04-04 20:58:21 +11: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
3bb6cc8af9 Merge pull request #8625 from xxalpha/cyberplus
Cyber Implants +
2015-04-04 20:57:48 +11:00
Jordie
20ed6aada5 Merge pull request #8668 from ACCount12/syndieboxes
Toolboxes & welders update
2015-04-04 20:57:15 +11:00
xxalpha
7ec043a542 Added medical hud implant to CMO locker. Added chest implant sprites. 2015-04-04 00:56:06 +01:00
Remie Richards
862657bd7c Merge pull request #8421 from dannno/guncases
gun lockers
2015-04-03 18:40:40 +01:00
danno "big fucking moron" gonzales
1f94f2fe27 Update guncase.dm
change 4 to capacity
2015-04-03 13:19:45 -04:00
danno "big fucking moron" gonzales
8de848eccb Update guncase.dm 2015-04-03 13:16:25 -04:00
kingofkosmos
2e4a8fcce8 Recieve --> receive grammarfix
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.

Fixes #8576
Fixes #8504
2015-04-03 19:42:34 +03:00
danno "big fucking moron" gonzales
cd3f2516e0 Update PDA.dm
i fucked up
2015-04-02 16:42:14 -04:00
dannno
fcd5938545 Merge branch 'master' of https://github.com/tgstation/-tg-station into sadclown 2015-04-02 16:30:08 -04:00
Artur
3ff5980e85 - Adds Picket Signs 2015-04-02 18:23:17 +02:00
dannno
6cba1d829c a buhhhhhh buhhhhhhhhhh 2015-04-02 10:21:06 -04:00
Jordie
a8a2ffc123 Merge pull request #8662 from phil235/AddBloodFix
Fixes lack of dna in old blood.
2015-04-02 20:25:38 +11: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
dannno
a2dfdc8f7b sad trombone for clown pda 2015-03-31 14:13:48 -04:00
phil235
0b403b3b03 Fixes lack of dna in old blood.
Fixes some comments about blood procs in atoms.dm
Small tweak in xeno blood blood_DNA.
2015-03-31 19:48:44 +02:00
Swag McYolosteinen
d8c588867a Merge pull request #8634 from sawu-tg/master
See #7217
2015-03-31 19:40:33 +02:00
dannno
4051efc3a9 Proper UI for gun lockers 2015-03-31 12:54:24 -04:00
Jordie
005c519b94 Merge pull request #8622 from phil235/TableclimbKnockFix
Fixes tableclimber knocking themself off the table when clicking it mid-climb
2015-03-31 22:06:51 +11: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
67d9f77ea9 Merge pull request #8600 from phil235/AlienNestFixing
Fixes alien nest buckling
2015-03-31 00:06:14 -05: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
12a729adcd Fixes many instances of lying mob getting shifted up (pixel_y reset to 0) by adding a lying_pixel_offset var to mob/living.
Removes the delay when toggling resting, sleeping and pouncing, the mob sprite will now update instantly.
2015-03-30 23:14:21 +02:00
phil235
0cef9e5539 Merge pull request #8198 from Xhuis/cigar_cases
Adds cigar cases
2015-03-30 18:47:46 +02:00
Sawu
bfd0436324 See #7217
* Spraycans are given to Revheads
* Spraycans act as instant use crayons.
* Spraycans can be used on walls.
* Spraycans can be used as ghetto pepper spray, but leave the target with a coloured face (can be removed with space-cleaner)

(Old pictures, there is now only one can that changes color)

![can1](https://cloud.githubusercontent.com/assets/3829126/5812999/c3992e38-a0c9-11e4-8620-3e1ecbc97630.PNG)
![can2](https://cloud.githubusercontent.com/assets/3829126/5813002/c92d56d0-a0c9-11e4-8592-6ae15f594ca8.PNG)
![cap3](https://cloud.githubusercontent.com/assets/3829126/5825994/88a9260a-a143-11e4-8cd7-cd4491b0db2a.PNG)
![can4](https://cloud.githubusercontent.com/assets/3829126/5828055/28766ffc-a154-11e4-8bfb-f8475c84c6a4.PNG)
2015-03-31 02:26:05 +11: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
phil235
0745219d06 Fixes tableclimber knocking themself off the table when clicking it mid-climb. 2015-03-29 23:57:47 +02:00
Jordie
373516e522 Merge pull request #8579 from phil235/WelderInClosetFix
Fixes not being able to put unlit welding tool in open closets
2015-03-30 01:22:35 +11: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
Fayrik
4f43fff199 Issue fixes! All that, and more! 2015-03-29 03:54:41 +01:00
phil235
2ef01a61c5 Fixes alien nest not blocking the victim from instantly unbuckling. The victim now needs to click the nest or resist, then wait 2 minutes before being free.
Fixes alien nest buckling pixel offset.
Removes resist unbuckling 'success' message so there's not two unbuckling messages.
Fixes objects with buckling not unbuckling its buckled mob when the mob is gibbed (Fixes alien nest overlay not disappearing when larva burst and gib its host).
2015-03-28 23:02:44 +01:00
phil235
e80a50f1c7 Fixes not being able to put unlit welding tool in open closets and not being able to open a closet with an unlit welding tool in your hand. 2015-03-28 00:12:06 +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
cb23548768 Merge pull request #8533 from Jordie0608/greatpermitsbringgreatweightresponsibility
Fixes #8527, construction permit weight
2015-03-27 14:04:38 -05:00