Commit Graph

87 Commits

Author SHA1 Message Date
Fox-McCloud 2ad1c74457 Singularity Refactor 2015-06-10 20:04:28 -04:00
Fox-McCloud 5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -04:00
ZomgPonies 1935a82afe 2/3 of port done 2015-05-25 19:48:13 -04:00
Krausus 6ba24c8069 Adds admin_jump_link and AI eye jumping
Also fixes a little mistake in ghost AI eye following.
2015-05-23 09:50:38 -04:00
Krausus f5be679752 Adds ghost_follow_link and AI eye following 2015-05-23 08:54:13 -04:00
PJB3005 257e77c400 /vg/ Multitool menu port!
With 100% better squashing.

I hope.
2015-05-14 22:34:02 +02:00
Tigercat2000 29c59bd51b Add check for antags in msg_admin_attack
This commit first adds a new helper proc labeled isAntag(), as well as
adding a check for antags for every instance of msg_admin_attack().

Goals of this commit:
 - Make admin ATTACK: logs indicate if attacker is an antagonist.

Note; High probability of merge conflicts, 47 files changed.
2015-04-12 08:41:53 -07:00
ZomgPonies 91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
SamCroswell b8a9c902a1 Removes Space Ninjas 2015-03-02 19:05:44 -05:00
Markolie 6b70bfec74 NanoUI update 2015-03-01 04:22:12 +01:00
Markolie b28f791f8f (Porta) turret update, map area update 2015-03-01 02:10:32 +01:00
Markolie 3f51486ba4 Bug fixes, bot proces controller update 2015-02-24 01:40:43 +01:00
Fox-McCloud 2a1028324c Thickmaterial Flag 2015-02-21 07:26:25 -05:00
Markolie 9fedfc7c62 Switch copytext and sanitize proc 2015-02-20 22:17:13 +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 4bcdb94a99 Merge with upstream/master
Fixes conflicts
2015-02-18 13:41:32 -05:00
Markolie 21926c9e48 Part 1 of saycode/language/species port from Bay 2015-02-17 23:20:50 +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
Markolie c507158b8f Camera code update, fix runtime 2015-02-10 15:42:47 +01:00
Markolie 09321d6c0b Use station_name proc where possible, mapfix 2015-01-21 23:37:05 +01:00
Fox-McCloud af61ed860a Grey Rebalance 2015-01-18 15:54:11 -05:00
DZD f1eb7971e1 Armor/Damage Changes
- Fixes armor RNG killing for thrown items.
- Kidan no longer act like they have a built-in riot shield (50 -
damage/3)% chance to ignore damage, but take 20% less brute
consistently.
- Entirely missing with a projectile or melee attack is impossible, but
you are more likely to hit a part you were not aiming at. (Ports tg
ran_zone proc and axes current get_zone_with_miss_chance proc).
- Removes some snowflake code for lightning projectiles (Power Glove
traitor item uses these).
2015-01-17 22:33:47 -05:00
DZD 0820364e27 Returns check_zone to former state. 2015-01-17 20:51:29 -05:00
DZD eb56e6c21c Ports check_zone and ran_zone from /tg/
As per Fox's request.
2015-01-17 20:25:48 -05:00
Markolie 37b86cd8f1 Xenos gamemode rework 2014-12-13 02:08:22 +01: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
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
mwerezak ee3b362f8e Adds miss chance and shield checks to thrown atoms
Also makes setting a thrown atom's throwing var the responsibility of
the handler, so that impact handling code can decide if the thrown atom
should keep on going.

Conflicts:
	code/game/atoms.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/living_defense.dm
2014-07-16 09:42:11 -04:00
Kelenius c54b9e3626 Slime update
Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/metroid/death.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/say.dm
	code/modules/mob/transform_procs.dm
	code/modules/reagents/Chemistry-Recipes.dm
	maps/tgstation2.dmm
2014-07-15 00:50:41 -04:00
ikarrus 50bf910867 Securitron Update
-Added a new access type that will act as a weapon permit that the HoS/HoP can manage. Centcom, Security, Captain, HoP, and the Barman start with it.
-Securitrons will now have the option to declare arrests they make to anyone who is wearing a security HUD. This can be turned off per-securitron
-Securitrons now have the option to arrest humans without any IDs. Defaults to off.
-Changed how securitron threat assessment is calculated
-Removed detective access from securitrons
-Stunning and cuffing now properly bolds their text for the perp
-Pingsky has its own type now

I realise there is a lot of existing duplicate code between the EDs and the securitrons, but I don't think I'd have the capability to tackle that any time soon.

Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/jobs/access.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/security.dm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/secbot.dm
	code/modules/admin/verbs/debug.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
2014-06-25 09:30:08 -04:00
jack-fractal fd4cd0007c fixing the player panel to work with spirits and masks
Conflicts:
	code/modules/admin/player_panel.dm
	code/modules/mob/mob_helpers.dm
2014-05-17 01:22:13 -04:00
jack-fractal 05da6ed973 adding modifications to cult mode, working spirits, and mask transformation procs
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_movement.dm
2014-05-15 05:16:13 -04:00
jack-fractal 3df35fe03c modifying visibility interface of ai to use generic visibility_interface
Conflicts:
	baystation12.dme
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/modules/mob/living/silicon/ai/freelook/cameranet.dm
	code/modules/mob/living/silicon/ai/freelook/chunk.dm
	code/modules/mob/living/silicon/ai/freelook/eye.dm
	code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
2014-05-15 04:43:49 -04:00
fleure 0dcee05ab2 Watertank nozzles no longer delete
Conflicts:
	code/game/objects/items/weapons/tanks/watertank.dm
	code/modules/mob/mob_helpers.dm
2014-04-19 18:17:49 -04:00
ZomgPonies 65d023dd93 Facehugger to Full alien, all player controlled 2014-01-19 16:45:20 -05:00
ZomgPonies 90496be20a Standardized intent names so it's all harm. Fuck you hurt. 2014-01-19 08:30:50 -05:00
Rob Nelson 55e918cc6a Wire hacking recode from /tg/.
Conflicts:
	baystation12.dme
	code/__HELPERS/mobs.dm
	code/defines/obj/weapon.dm
	code/game/machinery/alarm.dm
	code/game/machinery/doors/airlock.dm
	code/game/machinery/machinery.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/paicard.dm
	code/game/objects/items/weapons/explosives.dm
	code/global.dm
	code/modules/assembly/signaler.dm
	code/modules/mob/living/silicon/mommi/life.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/wires.dm
2014-01-12 22:37:55 -05:00
errorage eeeb68638f Partial commit for the cyborg UI upgrade, which gets rid of the pop-up window for module selection, instead displaying the available modules in storage-item like fashion.
Conflicts:
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/robot.dm
	code/game/objects/items.dm
	code/modules/mob/living/silicon/robot/inventory.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_defines.dm
2014-01-06 20:57:04 -05:00
ZomgPonies 80e78d1a03 Bugfixes 2013-12-11 19:23:04 -05:00
ZomgPonies 5daf979b72 Pretty much all new click code 2013-10-12 14:44:36 -04:00
ZomgPonies a935863200 Made blob gamemode work, removed ninjas because needs overhaul, optimized some strings 2013-09-08 11:39:33 -04:00
Mloc-Argent 71bdaa1698 Fully reverts clickdelay change.
It was immensely buggy with certain mobs, and server lag all but negated the benefits.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-13 13:10:09 +01:00
Mloc-Argent 9d2e107005 Reactiveness update part 1: Removed click delays from most objects, keeping them on for attacks and breaking windows/grilles.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-25 18:30:24 +01:00
Chinsky 9c43050ba7 Change to check_zone proc.
It makes possible to target hands/feet/groin.
Not sure what side effects would this change have.
2013-02-16 19:01:48 +04:00
Chinsky 764fa03a17 Fix for negative miss chance modificators working. 2013-02-16 18:58:43 +04:00
Chinsky 1e44b47b83 No, monkeys do not have organs, stop lying. 2013-02-06 19:19:38 +04:00