Commit Graph

5039 Commits

Author SHA1 Message Date
ZomgPonies 8c965ec9c1 Compile fix 2014-08-16 21:22:21 -04:00
PsiOmega 6158805a68 Fixes #5946 and cuts down on duplicate code across Life() procs.
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/mob.dm
2014-08-16 21:18:18 -04:00
ZomgPonies b06eb66ca4 Fix for bloody hands yanking shit 2014-08-16 20:58:37 -04:00
Bone White 866db87ec0 Removed two debug comments 2014-08-17 00:43:54 +01:00
VampyrBytes cfef299686 Genetics fixes
Fixes issue with getting target in remote talk, remote view and empath
Fixes Empath  not recharging
Fixes inability to cancel remote view
Fixes Grays not starting with remote talk
2014-08-16 11:51:17 +01:00
Bone White aea80f8200 Altered disarm knockdown
now only occurs with a 30% chance if you already have an aggressive grab
(or better) on the target.

No more disarm > stun baton.
2014-08-16 06:21:31 +01:00
VampyrBytes 9ecfe0d311 Several fixes
Fixes MP's being affected by radiation
Fixes Nuke Ops MP's explosive implant not going off
Fixes PDA Crew Manifest not showing support staff
2014-08-13 11:07:07 +01:00
ZomgPonies 9919eac70d Merge pull request #380 from Bone-White/master
EVA slow alterations
2014-08-13 00:15:15 -04:00
Bone White 7136864763 EVA slow alterations
Far less punishing to "better" rig types e.g. CE, syndicate, ERT,
deathsquad, wizard
2014-08-13 01:23:53 +01:00
ZomgPonies 65af681dad Merge pull request #370 from Regory/tajaran-spawn-gloves
Better Racial Item Spawns
2014-08-11 20:37:02 -04:00
Regory f8ed5bf6b6 Sync Changes from Paradise Master
Sync changes
2014-08-09 18:48:19 -04:00
Regory 7ac1d76f80 Fixes equip_or_collect
Equip_or_collect fixed to not delete the item being equipped.

Equip or Collect would use equip_or_del, and if failed, would try to
insert the item in a bag.  However, equip_or_del deletes the item, so it
cannot be put in the bag afterwards.
2014-08-09 17:53:18 -04:00
Bone White 14f3bc7529 Added pda to strip menu
PDAs can be stripped off or placed on a uniform now without having to
remove the uniform.
2014-08-09 17:45:31 +01:00
alex-gh 7b61b6563a Merge pull request #363 from Bone-White/master
Added procedural slow to EVA suits
2014-08-08 03:17:19 +02:00
Bone White 3e285690ae update for procedural eva slow 2014-08-08 02:11:44 +01:00
Bone White 9ffa4b8ee7 Added procedural slow to EVA suits
Slow increases as pressure around them increases.  At higher than 80kPa
the slow is 4 units (as compared to diona's natural slow of 5)
2014-08-08 01:39:42 +01:00
ZomgPonies 6e67faf4fc Merge pull request #358 from VampyrBytes/master
More MP fixes
2014-08-06 19:04:26 -04:00
alex-gh bbc9e51679 is_in_brig() fixes 2014-08-06 23:42:54 +02:00
Jeremy Liberman a4196cb745 Add Vox Heist directive and call shuttle on completion of Directive X
Conflicts:
	baystation12.dme
	code/controllers/emergency_shuttle_controller.dm
	code/modules/mob/mob.dm
2014-08-06 23:12:24 +02:00
VampyrBytes 5377a879b8 More MP fixes
removed immunity to pressure that was added with overheating

MP will now revive when their heads are reattached
2014-08-05 10:48:21 +01:00
Rob Nelson 3a3e8ac7be Fix grey eyes, add bitching when hairstyles are invalid.
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/new_player/sprite_accessories.dm
2014-08-04 22:29:38 -04:00
Rob Nelson a78316732f Fix compile. 2014-08-04 22:23:26 -04:00
Rob Nelson 7e8c1cf7fe Plasmamen ignite when not wearing their suit.
Conflicts:
	code/modules/mob/living/carbon/human/human_defines.dm
2014-08-04 22:23:11 -04:00
mwerezak c22ea7a5c0 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 16:15:47 -04:00
mwerezak 90e0da92cc 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

Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living_defense.dm
2014-08-03 16:15:10 -04:00
mwerezak 8829bca02b 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.

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
2014-08-03 16:11:04 -04:00
mwerezak 2c7926eff8 Stunbaton fixes and cleanup
Apparently harm intent is "hurt", not "harm"

Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
2014-08-03 16:09:38 -04:00
mwerezak 3eae360963 Handcuffs now require an aggressive grab
Conflicts:
	code/game/objects/items/weapons/handcuffs.dm
2014-08-03 16:07:35 -04:00
mwerezak ee9fe24083 Fixes siemens coefficient not blocking stun disarm
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
2014-08-03 16:02:47 -04:00
mwerezak 321598a8a1 Makes humans scream if taking enough halloss 2014-08-03 16:01:04 -04:00
mwerezak 279718728f Allows the use of stun weapons to show up in autopsies
Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/carbon/human/human_defense.dm
2014-08-03 16:00:48 -04:00
mwerezak bbdd4641d0 Adds disarm effect for stun weapons and hands 2014-08-03 15:59:39 -04:00
mwerezak f43a3ead70 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

Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living.dm
2014-08-03 15:59:21 -04:00
mwerezak 64638987dc Adds siemens_coefficient handling to stun batons
Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
2014-08-03 15:54:34 -04:00
mwerezak ac0e3966d6 Taser cleanup and fixes
Fixes cloaking devices and deadman switches being included in taser code
somehow.

Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
2014-08-03 15:47:21 -04:00
mwerezak 0dc07bafa1 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.

Conflicts:
	code/_onclick/item_attack.dm
	code/game/objects/items/weapons/stunbaton.dm
2014-08-03 15:40:19 -04:00
mwerezak e76cc064df Fixes siemens_coefficent not affecting shock damage
Also cleans up electrocute_act()

Conflicts:
	code/game/gamemodes/events/ninja_equipment.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human.dm
2014-08-03 15:24:53 -04:00
Loganbacca 5faef31f60 Train fixes and balancing
- Slows trains to 90% of running speed
- Changes train impact damage to only take into account speed, not train length (otherwise you could insta kill people with a long enough train)
- Fixes a bug with towed cars ghosting through closed airlocks
- Stuns mobs who fall off a train that has blown up
- Fixes mobs standing/lying on vehicles
- Fixes exploding trains not decoupling correctly

Conflicts:
	code/modules/mob/mob.dm
	code/modules/vehicles/cargo_train.dm
	code/modules/vehicles/train.dm
2014-08-03 15:13:52 -04:00
ZomgPonies ebca6c5e61 Derpyderp 2014-08-03 15:06:47 -04:00
ZomgPonies 3facb45fa2 Derp 2014-08-03 15:05:22 -04:00
Walter0o 2a0a7db434 cyborg topic exploit fixes
all kinds of fun here
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
2014-08-03 15:04:48 -04:00
Zuhayr a8ae953579 Fixes #5630
Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
2014-08-03 14:54:45 -04:00
Zuhayr 20e6a01bb8 Fixes #5737 2014-08-03 14:53:45 -04:00
VampyrBytes b8bb0d1347 Machine people fixes
Disables overheating as most players reporting it makes machine people
unplayable

Fixes machine people's immunity to clone damage

Ensures machine people fall apart and consiousness transferred to
posibrain properly

Prevents robotic chest and groin being seperated which was leading to an
unrepairable body
2014-08-02 11:39:01 +01:00
ZomgPonies 6e925c0e50 Merge pull request #350 from VampyrBytes/master
several fixes inc #233
2014-08-02 18:58:27 -04:00
PsiOmega e9cbca8aa5 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.

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
2014-08-01 03:52:19 -04:00
VampyrBytes ea07c3b06b several fixes inc #233
Fixes icon creation issue in certain situations such as humanising
monkeys and cloning
Fixes humanized monkeys reverting to monkey name after being used for
cloning
Fixes humanized monkeys being made as human parent object instead of
human/race
2014-08-01 06:38:01 +01:00
ZomgPonies 0aa7f2013e Revert "Fixes #5827"
This reverts commit c3caf5c403.
2014-08-01 01:37:47 -04:00
Zelacks ffacf4cc1f Alien Icon Fixed and revamped
Conflicts:
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	icons/mob/alien.dmi
2014-08-01 01:36:59 -04:00
Atlantiscze c3caf5c403 Fixes #5827
- Drones can now use .d to access Drone chat
- Cleaner and nicer check for dronechat, uses proper data from say.dm shortcut list.
- MISSING: .d alternative for "Russian localization" (Does anyone actually use that?)
2014-08-01 00:59:33 -04:00