Commit Graph

8307 Commits

Author SHA1 Message Date
Chinsky dddaab172c Made missing limbs not process.
Moved code in processing so that ORGAN_DESTROYED limbs won't process wounds and chemicals. They still need to process once to actually fall off (too lazy to change that)
Made dropping limbs remove all wounds and germs. Instead, one big wound is spawned on parent organ. Damage depends on the organ.
Removed missing  limbs bleeding on their own, since that's what that wound is for now.
They still would ache until surgically mended anyway.
Fixed possible issue with amputation not fixing the rotten limb.
2014-08-11 04:35:45 +04:00
Chinsky 749bd6d3f2 Merge pull request #5920 from Jarcolr/patch-1
Move through blenders and pull blenders places
2014-08-10 04:00:11 +04:00
Jarcolr a3cbbe4d0b Move through and pull blender
Changed density and anchored to 0.
2014-08-08 20:39:35 +03:00
PsiOmega 00fcfa7899 Makes it possible to setup pAI configuration from the character setup screen. 2014-08-08 13:31:52 +02:00
PsiOmega 8568a6aa89 Explicit proc/Topic definitions. 2014-08-08 13:21:51 +02:00
Chinsky 9f9865dac4 Merge pull request #5619 from mwerezak/power-net
ATMOSPHERICS and Power Net Overhaul
2014-08-08 09:49:42 +04:00
mwerezak 47b32122d4 Updates disposal bin pressurization
Also tweaks flasher power use.
2014-08-07 19:31:17 -04:00
Zuhayr 1384a93b59 Merge pull request #5904 from MrSnapwalk/icanseeeverything
Adds toggleable goggles.
2014-08-07 10:02:34 +09:30
MrSnapwalk 96849c6de4 Adds a feedback message for toggling goggles. 2014-08-05 21:28:16 -05:00
MrSnapwalk 507b173d11 Adds toggleable goggles. 2014-08-05 21:24:45 -05:00
Ccomp5950 ec3262a2a9 Merge pull request #5894 from atlantiscze/cyborg_module_icons
Cyborg component icons!
2014-08-04 19:38:57 -05:00
Ccomp5950 a4fc1bfd6a Merge pull request #5886 from mwerezak/stun-baton
Fixes some handcuff oversights
2014-08-04 15:15:52 -05:00
Atlantiscze 3627417c7b - Adds cyborg module icons. Each component has it's own specific icon now. Two icons are animated, four static. Includes broken versions.
- AI radio icon (chat icon) updated to use icon from robot_component.dmi file - removed duplicity from radio.dmi
- Cyborg radio icon (chat icon) updated to look like the radio module.
2014-08-04 09:25:53 +02:00
mwerezak cf9fe8de76 Fixes some handcuff oversights
You now don't need to be grabbing to put handcuffs on yourself, and you
can now put hancuffs on if your grab state is higher than aggressive.
2014-08-03 11:49:37 -04:00
mwerezak cb2f68f81e Merge remote-tracking branch 'upstream/dev' into power-net 2014-08-03 01:50:51 -04:00
Zuhayr f510c05865 Merge pull request #5862 from mwerezak/stun-baton
Stun Baton Nerf
2014-08-03 12:59:54 +09:30
Zuhayr 67799a5324 Merge pull request #5871 from PsiOmegaDelta/PhotoAI
Fixes runtime error when borgs attempt to sync photos with master AI
2014-08-03 12:58:15 +09:30
Zuhayr 2619fb61ce Merge pull request #5872 from PsiOmegaDelta/Manifest
Fixes #5867
2014-08-03 12:57:19 +09:30
Mloc e2ea86eab1 Merge pull request #5699 from Zuhayr/calamity
Calamity mode.
2014-08-02 11:39:29 +01:00
mwerezak 91d503e209 Removes duplicate code from human/bullet_act
Also moves stun projectile handling up to living/bullet_act, as all the
human specific code has been moved to other procs
2014-08-01 23:57:18 -04:00
Zuhayr 0868c344cc Adjustments and a typo fix. 2014-08-01 23:50:33 +09:30
Mloc 457d76f441 Merge pull request #5834 from Zuhayr/hydroponics
Changes dev hydro to use reagent procs.
2014-08-01 15:01:52 +01:00
Zuhayr 2493dedf4b Merge pull request #5847 from MrSnapwalk/psychotailor
Psychiatrist/Psychologist update
2014-08-01 21:59:10 +09:30
Zuhayr 1376a827d6 Merge pull request #5833 from Jarcolr/customs
Adds *6* approved custom items and updates a custom item
2014-08-01 21:57:33 +09:30
PsiOmega 8104928e75 Creates a shared proc for applying AI verbs. DRY. Arranges some consistency among verbs.
Fixes #5867 as well as a couple other missing verbs.
2014-08-01 10:36:44 +02:00
PsiOmega c416205c7d Moves robot/drone specific New()-code into their respective classes, handling it using proc-overloads.
Also re-arranges robot init() code to prevent a runtime error when attempting to synch photos with the Master AI.
2014-08-01 09:17:26 +02:00
mwerezak 63aab94d3c Cleans up weapon embedding code
Removed weapon embedding from human/apply_damage(), as it didn't really
belong there. As well, used_weapon is intended mainly for autopsy info,
so it didn't seem appropriate to use it to embed things.
2014-07-31 19:43:36 -04:00
mwerezak 768019b918 Stunbaton fixes and cleanup
Apparently harm intent is "hurt", not "harm"
2014-07-31 19:17:05 -04:00
mwerezak 71e54111ab Handcuffs now require an aggressive grab 2014-07-31 18:10:11 -04:00
mwerezak 8bd7a11ff4 Fixes siemens coefficient not blocking stun disarm 2014-07-31 17:19:35 -04:00
mwerezak 697979c2f6 Makes humans scream if taking enough halloss 2014-07-31 17:06:42 -04:00
mwerezak 5b90e4afc6 Allows the use of stun weapons to show up in autopsies 2014-07-31 17:01:06 -04:00
mwerezak ecd7df9628 Adds disarm effect for stun weapons and hands 2014-07-31 16:52:50 -04:00
mwerezak 56ccd4303b Merges taser and stun baton effects
Makes the code for handling stun weapon effects much cleaner.
Moves electrocute_act and emp_act from living.dm into living_defense.dm
2014-07-31 16:21:22 -04:00
mwerezak c8cccb64f6 Adds siemens_coefficient handling to stun batons 2014-07-31 15:38:56 -04:00
mwerezak 9bfb4642a2 Merge remote-tracking branch 'upstream/dev' into stun-baton
Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
	Made all obj/item/weapons have "swing_hit" as their default hitsound.
	Made hitsound not play when the attack misses.
2014-07-31 14:31:21 -04:00
mwerezak a644156bdf Taser cleanup and fixes
Fixes cloaking devices and deadman switches being included in taser code
somehow.
2014-07-31 13:40:23 -04:00
mwerezak 7130fd124b Stun baton nerf
Adds agonyforce var to stun batons, which causes halloss and eye blur.

Also did some clean up of stun batons, and fixed the stun baton's bcell
var being of type weapon/cell/high instead of weapon/cell.
2014-07-31 13:39:06 -04:00
Jarcolr 1e90a5b218 Adds Raptor1628's hazard hardsuit
http://baystation12.net/forums/viewtopic.php?f=33&t=10888
2014-07-31 10:44:34 +03:00
MrSnapwalk 84ceb30d27 Psychiatrist/Psychologist update. 2014-07-30 20:57:20 -05:00
Jarcolr e1267b7fdf Adds Supercotton's welding mask
http://baystation12.net/forums/viewtopic.php?f=33&t=10768
2014-07-30 21:20:33 +03:00
Zuhayr 70fe00e1c1 Updated borer icons slightly. 2014-07-30 21:51:17 +09:30
Zuhayr f2393d9465 Replaces antag intro text and objective announcement with a proc. 2014-07-30 21:36:31 +09:30
Zuhayr e885fc8115 Added Calamity mode. 2014-07-30 21:09:25 +09:30
Zuhayr dac4e3432e Adjusted borer spawns/options/vars. 2014-07-30 21:08:54 +09:30
Zuhayr 3105297f3e Adjusted spawn procs for heist and nuke. 2014-07-30 21:08:28 +09:30
Zuhayr fcd1c73b17 Adjusted gas exude code. 2014-07-30 20:54:36 +09:30
Zuhayr e2e039f72a Adjusted process_reagents() so hydro trays are refillable with water and nurients when the tray is dead/empty. 2014-07-30 12:39:28 +09:30
Zuhayr ca59536e06 Reapplying some fixes that I think DM may have saved over, whoops. 2014-07-30 12:34:36 +09:30
Zuhayr 251b44a53c Changed hydro trays, fertilizer and syringes over to use the reagent procs. 2014-07-30 12:24:03 +09:30