Commit Graph

777 Commits

Author SHA1 Message Date
comma
d3bc199ca9 Does not decreases metroid core count on unsuccessful removal.
Fixes Issue #1625
2012-08-18 15:46:22 +04:00
CIB
ab7c78f3f5 Merge pull request #1604 from comma/master
Metroid surgery fix
2012-08-12 03:57:27 -07:00
comma
49cdc1a13c Fixed metroid core surgery. 2012-08-12 02:39:57 +04:00
headswe
8103abcd9f Merge pull request #1583 from CIB/cib
Full wound system rewrite - Tested and ready to merge
2012-08-10 09:18:28 -07:00
comma
138e41dd54 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/game/objects/items/weapons/surgery_tools.dm

Did not do a pull in ages, all constants I sued in surgery code got renamed.
2012-08-08 13:21:47 +04:00
cib
5785c817f8 Added a few hacks to make wound processing happen less often. 2012-08-07 00:01:40 -07:00
cib
cc2aaf1731 Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/life.dm
2012-08-06 15:18:27 -07:00
cib
f13a961a65 Merge branch 'cib' of github.com:CIB/Baystation12
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/organ/organ.dm
	code/setup.dm
2012-08-06 13:36:26 -07:00
cib
0c67bc7439 Restructured the organ wound system.
Wounds are now datums rather than pure text, which means wound descriptions in examine will now always be in line with the actual damage of the mob.
2012-08-06 12:51:18 -07:00
comma
2e6da1ab7a Surgery changes.
Gameplay-wise:
-Made all messages consistent, no more message about 'beginning' to do something when actually it's done. (Addresses Issue #1540)
-Now to attack patient on table with surgery tool you need to have harm intent (Addresses Issue #1540)
-All surgeries now have delays and begin/finish messages on each step, much like bone surgery.

Code-wise:
-All code handling surgery steps was moved in appropriate procs for each tool, to get rid of one HUGE attack proc.
Now attack proc checks for prereqs for surgery (like masks covering face), checks for targeted zone and calls needed proc.
-Deleted all code that handled messages for when user performs surgery on himself, because that's honest to god dead code. You need to be down to get surgery don on you, and you can't use tools while down. So until something is changed, those messages removed to improve readability of code.
-Added interrupt proc, that handles interruptions during surgery for each tool. For now all types of surgery handled the same, may be implemented differently later.

Signed-off-by: comma <krauchinsky@gmail.com>
2012-08-06 19:07:48 +04:00
Cael_Aislinn
469a8bb601 ported over the majority of /tg's simple_animal code and changed a lot of things for simple_animals and critters
- added bears, mice (cats will chase mice, mice squeak occasionally)
- removed some unique simple_animals (ian and runtime will be the only ones for now)
- structure improvements, tweaks and cleanup for simple_animals and critters
- space carp should work fine now
2012-08-02 03:22:44 +10:00
FireFishie
8c7592fa00 Changed all entries of "Nanotrasen" to "NanoTrasen" and corrected the misspelling of "apologize" in the gravity toggle messages. 2012-07-31 01:14:14 -04:00
Albert Iordache
8a340237c6 Merge branch 'master' of https://github.com/comma/Baystation12 into comma-master
Conflicts:
	code/game/objects/items/weapons/surgery_tools.dm
2012-07-29 15:49:56 +03:00
comma
b2522daa5d Surgery bugs.
Stopped attacking patient during head surgery with hemostat.
Was caused by try_bone_surgery called twice in code.
Removed one redunant call.

Fixed runtimes during face surgery.
Null organ was caused by not being 'mouth' organ there.
Made it select 'head' as affected organ.
2012-07-29 08:21:37 +04:00
Head
3a1f30ece4 A few fixes. 2012-07-28 17:16:22 +02:00
Cael_Aislinn
4f3374cdaf compile fix
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-07-21 20:54:31 +10:00
Cael_Aislinn
779ca913f4 death alarm implants no longer announce deaths on syndicate shuttles
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-07-21 20:51:11 +10:00
Albert Iordache
8b976b3279 Debug message 2012-07-15 12:29:02 +03:00
Albert Iordache
b94b57e04c Partially fixed the double definition of BROKEN, renamed organ definitions 2012-07-13 23:42:05 +03:00
cib
674042aa35 Cauterizing amputated limbs should now stop the pain. 2012-07-07 13:00:29 +02:00
cib
bce2e2a66a Removed redundant wire object. 2012-07-07 11:17:11 +02:00
CIB
f6fe1f252e Fixed some issue with cyborg limb repair wires. 2012-07-07 11:58:52 +03:00
unknown
050b697486 Ugh, grammar 2012-07-06 15:37:05 +03:00
unknown
3d839120a4 and some more 2012-07-05 23:06:03 +03:00
unknown
46dcfb2d3d Fixes wounds not bleeding and makes gauze stop bleeding
Fixes issue #1408
2012-07-05 20:48:08 +03:00
unknown
507dc7cc84 Fixed surgery bleeding bug
Clampers did not clamp properly
2012-07-05 17:32:45 +03:00
unknown
7a8f5ec38e Makes ointment give different message from gauze when applied.
No more 'bandaging with ointment' (Issue #1430)
2012-07-05 15:08:12 +03:00
Erthilo
8acd06ddda Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2012-07-04 09:00:59 +01:00
unknown
b0cb325bb6 Fixed a derp 2012-06-30 14:16:04 +03:00
unknown
427d409113 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-06-30 13:43:08 +03:00
Erthilo
f5b221bb63 Fixes a few places where if statements wouldn't work due to syntax errors. 2012-06-29 02:31:46 +01:00
Erthilo
73e2b5f5c2 Hotfix for stun batons harming on all non-help intents. 2012-06-28 22:31:16 +01:00
Erthilo
73ba4c7f0f Readjusted Medical items heal caps. 2012-06-27 23:36:38 +01:00
unknown
869a82a3e3 Clipboards changes
+Added 'Rename' function
+Added ability to add photos to clipboards

%Fixed linebreaks not being replaced with <br> when viewing paper from clipboard

Signed-off-by: Chinsky <comma@nano.(none)>
2012-06-27 23:12:09 +03:00
Erthilo
e65b1739be Fixes surgery in general. 2012-06-27 18:08:56 +01:00
Erthilo
2ba8581267 Fixes gauze/ointment not being applied to wounds. 2012-06-26 20:36:16 +01:00
unknown
5565c466e7 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-06-26 21:46:03 +03:00
Erthilo
6aaceee446 TG: Fixed harmbatons on everything other than harm, now it is the opposite way
round.
Clarified swirlie failure feedback.
Revision: r3781
Author: 	 petethegoat
2012-06-26 00:10:30 +01:00
Erthilo
67c5e8e3a8 Medical System Updates...
* Dragging someone while injured (brute) will have a small chance of injuring them further that increases depending on how damaged they are. This coincides with the blood spatters that are already generated.
* Blood is now actually lost from the person being dragged.

* Added splints that can be applied to broken arms and legs, and will reduce effects of broken limbs. These can be removed the same way as handcuffs. They show up on the mob and on examine.
* Added an autoinjector that can only hold five units, but acts like a hypospray.
* Added an advanced medical kit that Medical Doctors spawn with that has Advanced Trauma Kits, Advanced Burn Kits, autoinjectors, and splints.
* Health Scanners now show unsplinted fractures ONLY in arms or legs.

* People in critical (less than -50 health) from external trauma (100+ damage from brute and/or burn) bleeding, and with unsplinted limbs, will send a message to anyone trying to drag them, to warn them it would be a bad idea trying to move them. They will suffer a lot more damage if dragged while lying down.
* The correct procedure is therefore, A) Bring a roller bed, or B) Splint all limbs, stop all bleeding with gauze, and then drag them.

* Fixed CPR being performed at weird health levels.
2012-06-25 01:18:55 +01:00
SkyMarshal
3efa1d4e6b More fixes. 2012-06-23 17:00:28 -07:00
SkyMarshal
62c3d1d11d De-retarded wound system. 2012-06-23 16:35:58 -07:00
Erthilo
e7e1b8f9e8 More compile stuff. 2012-06-23 16:14:00 +01:00
Erthilo
8b4033c410 TG: - Ported cable restraints from Bay12. You make them by using a verb on cable
coils. Takes 15 lengths to make, applied the same way as handcuffs, they have
the same effects as handcuffs, but only take 30s to remove if you resist. They
can also be removed by using wirecutters on a handcuffed mob.
- Added 4 new cable colors. Pink (ported from Bay12), orange, cyan and white.
- Engineer tool belts can now also spawn with orange wire, in addition to yellow
and red.
- Tool closets and electrical toolboxes can now spawn with cables in any of the
8 colors.
- Added cablecuff.ogg from bay12, played when you apply cable cuffs on someone
- Added this stuff to the changelog

So yeah, some stuff is credited to bay12, tho some of it was nearly enough
completely recoded.

Screenshots:
http://www.kamletos.si/wire%20colors.png
http://www.kamletos.si/cuff%20restraints.png
Revision: r3770
Author: 	 baloh.matevz
2012-06-23 16:04:24 +01:00
Erthilo
13aa7558a6 TG: Fixes a pesky compile error in my last commit.
Revision: r3756
Author: 	 vageyenaman
2012-06-23 15:10:49 +01:00
Erthilo
dfb6676ebb TG: Not a whole lot going on in this commit, just more work on preparation for the
traitor factions update. Added some new sprites and weapons.

New weapon: Delivery grenade. Can spawn an x amount of mob/object y in a
constant radius. It is currently used for carp and manhack delivery grenades.

!! Important !!: Certain telecomms computers were causing very nasty machine
disruption through some very silly mishap involving re-programming a computer's
network. Basically, it was breaking machine procs every time you messed with
them. This should hopefully make telecomms a lot more stable.

Fixed a bug where the reflexes nanoaug would not actually dodge the projectile
if the person was clicking directly inside the target's 32x32 border.

I changed around some core PDA messaging functions in preparation to PDA
Chatrooms (yes Legality it's happening). However I'm going to hold off actually
implementing it until Messycakes is either completed with his PDA UI overhaul or
just stops working on it.

Committed two patches from separate people in the forums. Chemical Cigarettes by
Neek (http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=8775) and Clicking
genetics blocks by Willox
(http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=8857). Check their respective
threads for more details. Sorry I couldn't get this earlier, guys!
Revision: r3755
Author: 	 vageyenaman
2012-06-23 14:59:54 +01:00
SkyMarshal
616be6eed8 More while loop stuff, removed shitloads of unnecessary curly brackets in the map reader, fixed ED-209 projectiles 2012-06-22 14:10:48 -07:00
SkyMarshal
580a83d334 Fixes for UL bugginess 2012-06-21 02:52:45 -07:00
SkyMarshal
ef3e93652c Fixes for Antiqua compilation and runtimes. 2012-06-19 21:37:41 -07:00
SkyMarshal
abe222afde Fixed botpathing. Some fixes/changes to glows. Made lights less piss yellow. 2012-06-19 20:52:01 -07:00
Erthilo
edd6f3ad88 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/machinery/doors/door.dm
	code/game/objects/transfer_valve.dm
	code/game/turf.dm
	code/modules/clothing/gloves.dm
	maps/tgstation.2.0.8.dmm
2012-06-19 22:09:30 +01:00