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
ZomgPonies
800d5b4b0b
Revert "Made wizard spells into various subtypes"
...
This reverts commit 8b703f55af
2014-07-23 10:58:20 -04:00
Ccomp5950
3f110c5bf7
screen_shake (meteors, etc.) made more robust and works with aiEyes
...
Before: multiple screen_shake's could queue up prior to screenshake being set on the mob setting
oldeye on the last one to queue up to be the random location from the previous screen shake
so sometimes peoples clients were stuck on a location instead of back on the mob.
Now we set screenshake before the spawn so we don't spawn up multiple screen_shakes on the same mob.
Test: Be ghost, hammer the spawn meteors secret 10 times or so, watch as your camera returns back to your mob.
Yay.
Conflicts:
code/modules/mob/mob_helpers.dm
2014-07-23 09:04:10 -04:00
Ccomp5950
fa8afbc09e
Tasers will now cause movement slow downs on the first hit
...
Before: Tasers do 40 halloss damage and that drops to 39 on next life() tick so most people won't be slowed down by the first taser hit.
After: If you have any halloss you will slow down some. I've set it at 1 delay for every 10 halloss, this might need adjusting (15 instead of 10 possibly)
Conflicts:
code/modules/mob/living/carbon/human/human_movement.dm
2014-07-23 08:54:09 -04:00
ZomgPonies
a422f28445
Oops
2014-07-22 18:32:08 -04:00
ZomgPonies
14b7c17b6a
Spider nerf
2014-07-22 15:11:03 -04:00
Walter0o
b24aafa3d6
borer mindcontrol release hotfix
...
forgot to remove this remnant ckey check
2014-07-22 13:54:19 -04:00
ZomgPonies
8b703f55af
Made wizard spells into various subtypes
2014-07-21 09:40:42 -04:00
Walter0o
bf61a0b593
removes second sleeping notification
2014-07-21 06:21:13 -04:00
ZomgPonies
5919243efd
Compile fix
2014-07-20 06:03:32 -04:00
Walter0o
238c198def
fixes simple_animals using FEA instead of ZAS
...
i can't believe after all this time animals still use FEA instead of ZAS.
this should fix the "random" animal deaths.
Conflicts:
code/modules/mob/living/simple_animal/simple_animal.dm
2014-07-20 05:58:01 -04:00
Walter0o
1bf157d4cc
borer detatch fixes
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
2014-07-20 02:20:16 -04:00
Walter0o
503cffaf96
borer detatch fixes
2014-07-20 02:14:14 -04:00
Walter0o
5c264d9ae3
fixes borer infest and detatch
...
Conflicts:
code/modules/mob/living/simple_animal/borer.dm
2014-07-20 02:13:58 -04:00
ZomgPonies
64554340f4
Modifed faction system to use a list instead. Mobs can belong to multiple factions at once.
2014-07-19 13:26:55 -04:00
Loganbacca
4dd5368c01
Fixed resisting out of lockers
2014-07-18 17:54:42 -04:00
Loganbacca
2fd4774d01
Fix resisting out of closets
...
- Removed do_after proc since it was hanging somewhere
2014-07-18 17:54:31 -04:00
ZomgPonies
60b0659d43
Made update_power be at mob level since spells are at that level.
2014-07-18 12:11:13 -04:00
ZomgPonies
9148e4b4a9
Removing more deprecated virus1 shit
2014-07-18 11:41:46 -04:00
Zuhayr
0ddab372bf
Added glass to the engineering module.
2014-07-18 07:38:30 -04:00
Zuhayr
3098c80f9c
Fixed some bugs, did some testing, moved some procs around for robot functionality.
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2014-07-18 07:38:11 -04:00
ZomgPonies
ff2557eb91
Compile fix
2014-07-18 07:35:22 -04:00
Zuhayr
0436cd3e48
Added paperwork handler, clerical gripper, some other tweaks.
...
Conflicts:
code/modules/mob/living/silicon/robot/robot_modules.dm
2014-07-18 07:34:12 -04:00
Zuhayr
8ae76446b7
Temp commit with robot module work
...
Conflicts:
icons/mob/head.dmi
2014-07-18 07:32:09 -04:00
Zuhayr
bdfc7ef719
Added Crisis and Surgeon modules, removed Medical module, added Construction module, altered Mining and Engineering modules.
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/silicon/robot/robot_modules.dm
2014-07-18 07:30:54 -04:00
Zuhayr
5a8aada05d
Fixes bug with drone Bump() check
...
They can now use teleporters, hand tele portals and the disposals chute.
2014-07-18 06:49:42 -04:00
Rob Nelson
f7b516a5ab
Shit catches on fire now
...
Conflicts:
code/ZAS/Fire.dm
code/game/objects/items/weapons/storage/bible.dm
code/game/objects/items/weapons/storage/boxes.dm
code/modules/mob/living/living_defines.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/photography.dm
code/setup.dm
2014-07-18 06:32:15 -04:00
Rob Nelson
8fbfd7ccd1
Ready_DNA not called in human new() when humans are spawned.
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
2014-07-18 06:13:10 -04:00
ZomgPonies
4ad8b741a2
Turned remote talk into a spell and optimized it, giving it it's action button
2014-07-18 02:38:53 -04:00
VampyrBytes
b3f396bfff
Fixes inventory bug
...
Fixes the bug where you couldn't interact with someone's inventory when
they were on top of a structure, such as a table
2014-07-17 05:48:59 +01:00
ZomgPonies
c654029821
New genetic defects MUAHAHAHAA
2014-07-17 05:36:30 -04:00
Heredth
ded49a5af9
Update whisper.dm
...
Conflicts:
code/modules/mob/living/carbon/human/whisper.dm
2014-07-17 05:29:17 -04:00
ZomgPonies
81c643924d
Icons for most genetic powers.
2014-07-17 02:57:36 -04:00
ZomgPonies
371fd82f54
Merge pull request #294 from VampyrBytes/master
...
Replaced Monkeyized() with working method
2014-07-17 01:35:32 -04:00
MrPerson
7a554f2be9
Make dead people stop jittering
...
Fixes #3690
2014-07-16 16:47:22 -04:00
mwerezak
0b61e8e646
Limits hearing sounds in a vacuum
...
Conflicts:
code/modules/mob/living/say.dm
2014-07-16 10:09:51 -04:00
mwerezak
9af839f34b
Thrown sharp objects no longer always embed
2014-07-16 10:06:40 -04:00
mwerezak
8644045eac
Moves human specific hitby code to human_defense
...
Conflicts:
code/modules/mob/living/living_defense.dm
2014-07-16 10:06:22 -04:00
mwerezak
b36ce010ad
Bad indentation causing robot modules to embed
...
Conflicts:
code/modules/mob/living/carbon/human/human_damage.dm
2014-07-16 10:04:34 -04:00
mwerezak
be448d9c73
Thrown momentum no longer depends on fingerprints
...
Conflicts:
code/modules/mob/living/living_defense.dm
2014-07-16 09:56:00 -04:00
