Commit Graph

4051 Commits

Author SHA1 Message Date
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
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