Commit Graph

4066 Commits

Author SHA1 Message Date
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
ZomgPonies
1b2e61f3d0 Bugfixes 2014-07-31 19:42:07 -04:00
Rob Nelson
8fd4346dc3 Plasmen bogfix
Conflicts:
	code/ZAS/Plasma.dm
2014-07-31 19:03:35 -04:00
Rob Nelson
7832e1c26f PLASMA MAAAAAAAAAAAAAAAAAAAAAAAN
Conflicts:
	.gitignore
	baystation12.dme
	code/_onclick/hud/screen_objects.dm
	code/modules/clothing/spacesuits/alien.dm
	code/modules/media/tapedeck.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/species.dm
	html/changelog.html
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/in-hand/in-hand_sync_report.txt
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/tank.dmi
2014-07-31 18:58:49 -04:00
PsiOmega
03e7aaba81 Fixes runtime errors. AIs and cyborgs can now attach their photos to newscasters as well as photocopy them.
Conflicts:
	baystation12.int
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/robot.dm
2014-07-31 17:38:14 -04:00
PsiOmega
6cbee92ec8 Expands the AI photo-camera so that it now has robot/cyborg support. Also implements DRY in practice.
Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/wires.dm
	code/modules/mob/transform_procs.dm
	code/modules/paperwork/photography.dm
2014-07-31 17:31:23 -04:00
PsiOmega
0e82de2d39 Makes it possible for the AI to take and view images.
Conflicts:
	baystation12.int
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/transform_procs.dm
	code/modules/paperwork/photography.dm
2014-07-31 17:25:10 -04:00
ZomgPonies
f900578f25 Merge pull request #348 from VampyrBytes/master
Spacepod movement fix
2014-07-31 00:58:45 -04:00
ZomgPonies
742bc8c9b3 Merge pull request #345 from SamCroswell/master
Alien Tweaks, Commented Out Detomatix
2014-07-30 22:59:12 -04:00
SamCroswell
94dbad82a4 Alien Tweaks, Commented Out Detomatix 2014-07-30 00:53:56 -04:00
VampyrBytes
9b08b90ab0 Spacepod movement fix
Fixes spacepods not being able to move when the gravity generator goes
down
2014-07-30 05:46:47 +01:00
mwerezak
ac3c812f28 Fixes chest not being coloured by necrosis
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
2014-07-30 00:16:16 -04:00
ZomgPonies
8c228fcc87 Trying to stop facehuggers being badass 2014-07-28 21:56:27 -04:00
ZomgPonies
89508f7e7f Merge pull request #334 from Bone-White/master
Advanced Medical Hud Glasses (medihud + flash protection)
2014-07-27 11:58:42 -04:00
Bone White
abde4759ae Advanced Medical Hud Glasses (medihud + flash protection)
For blueshield and brig physician.  Also added the item to blueshield
locker.  Item allows medical record viewing/editing.  I have _NOT_ added
security record viewing/editing.
2014-07-27 16:06:35 +01:00
Zuhayr
c0ba021bcd Added portable_atmospherics to hydroponics machine path, couple of other tweaks.
Conflicts:
	code/datums/supplypacks.dm
	code/game/machinery/hydroponics.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/tgstation2.dmm
2014-07-26 14:03:46 -04:00
Jarcolr
ff71c6f097 Fixes #5691
Chef >> Chefhat
2014-07-26 11:28:15 -04:00
Jarcolr
57051e0160 Fixes #5773
Added /obj/item/weapon/FixOVein to surgery cyborg modules.
2014-07-26 11:27:49 -04:00
Zuhayr
ebb9f724aa Hydroponics rewrite, details will be in PR. Big commit.
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/game/gamemodes/events/spacevines.dm
	code/game/machinery/seed_extractor.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/mob.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
	icons/obj/hydroponics.dmi
	maps/tgstation2.dmm
2014-07-25 11:10:01 -04:00
Rob Nelson
4c32f5f946 Fix jukeboxes needing reset after shuttle movement, [CLASSIFIED], warning fix.
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/atoms_movable.dm
	code/modules/mob/living/silicon/ai/freelook/eye.dm
	code/modules/nano/nanomapgen.dm
2014-07-24 21:01:49 -04:00
IcyV
8697118f8d Changes a brain damage message
From "faggot traitor" to "damn traitor" to follow more closely to the server rules.
2014-07-24 02:54:48 -07:00
PsiOmega
df59d8cbc7 Makes it possible for the AI to alt+left click turfs in camera view and grants ctrl/alt shortcuts to the turret control.
AI can now alt+left click turfs in camera view to list and interact with objects in the status tab. For example allows for interacting with emergency shutters beneath grills.
alt-clicking doors now notifies the AI when they are electrified/un-electrified as, unlike most other shortcuts, this doesn't have a visual cue.
When interacting with doors and the AI-control is disabled hacking is now automatically initiated, as if the AI had attempted to open the door 'menu'.
When borgs/AIs try to interact with an emagged door they now receive a feedback message that it's unresponsive.

Parts of implementation done by porting code from tg-station.

Conflicts:
	code/_onclick/ai.dm
	code/_onclick/click.dm
	code/modules/mob/living/silicon/ai/freelook/cameranet.dm
	code/modules/mob/mob.dm
2014-07-23 14:55:03 -04:00
ZomgPonies
7cbd6b1a81 Fix fatties 2014-07-23 12:22:37 -04:00
ZomgPonies
431ab486b3 Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row) 2014-07-23 11:04:07 -04:00