Commit Graph

307 Commits

Author SHA1 Message Date
ZomgPonies
e237fbd5e7 Fixes clicking not turning you 2015-02-20 19:56:57 +01:00
Markolie
d8d1670b68 Revert "Revert "Saycode/language/species port from Bay""
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-02-20 17:46:35 +01:00
DZD
212ca5f5bd MERGE CONFLIIIIIICTS 2015-02-19 20:26:36 -05:00
ZomgPonies
d54579850c Revert "Saycode/language/species port from Bay" 2015-02-19 20:15:42 -05:00
DZD
d0d6c8eebd Merge with upstream/master
Fixes merge conflicts.
2015-02-19 19:38:48 -05:00
DZD
c11bb0d283 Fixes bugs
- Tables can't have NODROP or ABSTRACT items placed on them anymore,
same for lockers and crates.
- Fixes a runtime with trying to strip a NODROP or ABSTRACT item.
2015-02-19 19:32:58 -05:00
DZD
4bcdb94a99 Merge with upstream/master
Fixes conflicts
2015-02-18 13:41:32 -05:00
Markolie
e868c66ad9 Fix warning 2015-02-17 23:55:26 +01:00
Markolie
b39a86078e Let ghosts use teleporter 2015-02-17 23:53:57 +01:00
Markolie
ad167dc541 Announcement system overhaul, crew monitor system overhaul, add portable crew monitor 2015-02-16 19:03:29 +01:00
DZD
723dc2ad98 ABSTRACT flag addition & handling
- Adds ABSTRACT flag to relevant items, removes abstract var.
- Adds checks for ABSTRACT where relevant.
- Also removes extra define of golem gas mask.
- Adds NODROP to changeling mutations so I don't have to do that later.
2015-02-12 18:49:26 -05:00
DZD
4e93cc5203 Merge with upstream/maser 2015-02-09 18:22:19 -05:00
Markolie
408a1eeb25 Accidentally completely broke click code 2015-02-09 16:39:14 +01:00
Markolie
7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
DZD
de9accc64d TG Changeling Port
This would've been multiple commits, but I kept forgetting to ACTUALLY
commit things. Changes logged in the PR.
2015-02-08 19:42:01 -05:00
Markolie
fba99e154d Accessory fixes 2015-02-08 14:55:32 +01:00
Markolie
8fae0f029f Accessory overhaul 2015-02-08 14:29:10 +01:00
DZD
b39a052a7a More Adminlogs
- Adds use_log list logging to AI/borg alt + click door shocking.
- Adds use_log list logging to PA control computer (Turning on,
increasing power, decreasing power).
- Adds use_log list logging to robotics control computer (borg full
destruct and single borg destruct).
2015-01-22 19:25:57 -05:00
Markolie
2677fd587e Bug fixes 2015-01-08 02:16:09 +01:00
Markolie
5bb4a3b1fe Minor changes 2014-12-24 13:13:49 +01:00
Markolie
f03bbf8bc6 Bug fixes 2014-12-24 12:53:49 +01:00
Markolie
da8115dc2e Bug fixes 2014-12-20 16:27:33 +01:00
Markolie
2c79a2f376 Bot fix, add emergency door access 2014-12-19 00:32:32 +01:00
Fox-McCloud
84b9f05149 Xeno Tweaking 2014-12-16 20:26:27 -05:00
Fox-McCloud
78d161742e Healthdoll 2014-12-14 16:43:06 -05:00
Markolie
37b86cd8f1 Xenos gamemode rework 2014-12-13 02:08:22 +01:00
Markolie
b8a440f23a Add clothing vendors to cargo, fix syndiborg/dsborg, laptop fix, other minor fixes 2014-12-07 04:55:48 +01:00
Markolie
aa68b2e160 AI/Cyborg HUD fixes, lets Vox's pick name when spawning, fixes Beepsky's/ED-209's ID'ing issue 2014-12-06 01:26:59 +01:00
Markolie
d0e9752931 AI HUD color update, add icon for sensors 2014-12-04 22:20:32 +01:00
Markolie
dab516174b Gives the AI control over bots 2014-12-02 17:59:40 +01:00
Markolie
c23d7e2e43 AI should now be able to examine things 2014-11-30 23:07:07 +01:00
Markolie
8ef2d4d441 Description fix 2014-11-25 23:37:56 +01:00
Markolie
202019bb05 Shift-clicking as AI's/borgs now examines 2014-11-25 23:36:42 +01:00
Markolie
30c1960fe8 Adds Syndiborg to NukeOps, enables shortcuts for borgs/drones, notifies the AI of borg changes 2014-11-23 07:52:38 +01:00
Markolie
0cd3223536 AI fixes, borg fixes, map fixes 2014-11-14 14:15:17 +01: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
ZomgPonies
cb441541f5 Added vampire HUD 2014-08-03 01:27:36 -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
ZomgPonies
5b5af35dc9 UI fixes for new AI photography 2014-07-31 17:43:28 -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
Zuhayr
d1059b488b Bevy of newhydro fixes.
Conflicts:
	code/game/machinery/vending.dm
	code/modules/projectiles/guns/energy/special.dm
	icons/obj/hydroponics.dmi
2014-07-28 13:49:18 -04:00
PsiOmega
21a9d92930 Adds a lost AltClick click-through for the AI. Makes it possible to clear a turf alt-leftclick selection. 2014-07-28 13:35:40 -04:00
DJSnapshot
be6f4b74a8 Updates to gun targeting UI. Fixes #5710
Conflicts:
	code/_onclick/hud/human.dm
	code/modules/client/preferences_toggles.dm
2014-07-24 18:36:52 -04:00
ZomgPonies
959a79748f Fix flash effect 2014-07-23 16:56:15 -04:00
PsiOmega
108cc696e3 Can now middle click doors to toggle bolt lights, plus cleanup.
Middle-clicking doors now allows the AI to toggle bolt lights.
Attempts to achieve some consistency in door feedback messages.

Conflicts:
	code/game/machinery/camera/tracking.dm
	code/game/machinery/doors/airlock.dm
2014-07-23 15:02:14 -04:00
ZomgPonies
91da592523 Compile fix 2014-07-23 14:57:12 -04: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
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
4b98dc1ff4 Xeno nerf 2014-07-21 10:08:02 -04:00