Commit Graph

1027 Commits

Author SHA1 Message Date
Incoming 68eb02adbd Fixes malf powers being broken because canusetopic was never a thing for AIs before this point 2015-04-13 17:40:28 -04:00
phil235 a0ea5dfefe Merge branch 'master' of https://github.com/tgstation/-tg-station into ProjectileFix1
Conflicts:
	code/modules/mob/living/simple_animal/friendly/cat.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/mob/living/simple_animal/friendly/lizard.dm
	code/modules/mob/living/simple_animal/friendly/mouse.dm
	code/modules/mob/living/simple_animal/hostile/bees.dm
2015-04-08 19:10:20 +02:00
phil235 8499413649 Makes living/verb/resist more object oriented.
Adds a fourth mob size "MOB_SIZE_TINY" to differentiate corgi size and mouse size. (used in bear trap code)
Rewrites beartrap/Crossed() to have less istype checks.
Adds a flying var to simple animals (used in bear trap code)
Makes pulling update in living/life.dm() to fix pulling not stopping when you're incapacitated.
2015-04-06 18:45:37 +02:00
phil235 c5b5427b0e Makes projectile non dense. Projectile hitting a dense obj/turf will now also hit one of the mob sitting on that turf/obj's turf.
Adds a has_limb var to mob/living to handle whether to specify the limb that is hit by a projectile or not.
Fixes runtime in handle_changeling.
Adds PASSMOB pass_flag and mob_size small to bees and mouse.
2015-04-01 20:59:42 +02:00
phil235 1b3eb49a1d Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/slime/say.dm
2015-03-26 02:31:06 +01:00
Jordie 0e57fc6941 Merge pull request #8488 from Miauw62/whatsthedifferenceanyway
Adds a verb_exclaim var. Fixes #8478.
2015-03-25 16:31:16 +11:00
Jordie 59af7cfd42 Merge pull request #8323 from Mandurrrh/miningborgupgrade
Adds a cyborg upgrade module for the satchel of holding.
2015-03-24 16:40:52 +11:00
phil235 ffd711c26f Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
2015-03-23 16:51:03 +01:00
Miauw ba2a1c8f19 Adds a verb_exclaim var. Fixes #8478.
Also makes saymods transmitted through the radio system for upcoming NTSL integration.
2015-03-22 18:55:59 +01:00
phil235 98f9916317 Yet more work on slime procs and life subprocs. 2015-03-21 20:44:32 +01:00
Remie Richards 819422bc3e Merge pull request #8410 from Miauw62/yesgunhogimrewritinggoofsay
MIAUW VON SAYCODE 3: RISE OF THE SPANS
2015-03-21 05:05:37 +00:00
phil235 aecb365f84 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/simple_animal/slime/life.dm
2015-03-20 19:32:16 +01:00
Swag McYolosteinen 9e25fe4019 Merge pull request #8431 from AnturK/lawsupdated
Adds total law changes counter
2015-03-20 17:46:44 +01:00
Miauw 49a3cea290 Fixes #8168 for real. 2015-03-19 20:53:21 +01:00
Miauw c4892765db Makes the sayspan rewrite not runtime everything to fuck.
Also fixes #8168
2015-03-19 20:42:33 +01:00
AnturK 7cccf20fc0 Adds total law changes counter 2015-03-19 14:57:12 +01:00
phil235 c9312a6ab7 Fixes silicons being flashed when welding. Silicons and repair drones now have eye protection like aliens. This means flashers and flashbangs no longer flash them, but flashbang still weaken them, and lasers and handheld flashes still work on them. 2015-03-19 04:04:44 +01:00
Miauw 3f64d2def3 Re-adds robot span classes. 2015-03-18 20:38:57 +01:00
Miauw 1873143e63 Initial say cleanup commit. 2015-03-18 19:23:31 +01:00
phil235 78d28a6d64 Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger
Conflicts:
	code/modules/events/ninja.dm
2015-03-15 12:30:27 +01:00
Cheridan da1e6f57f0 Merge pull request #8334 from MrPerson/cleanup_crew_comin_through
Code cleanup
2015-03-15 01:55:39 -05:00
Cheridan 8e2962c4ab Merge pull request #8255 from GunHog/SiliconVerbFix
Fixes "Sensor Augmentation" showing in silicon verbs
2015-03-14 23:08:19 -05:00
phil235 456a64f8fd slime from carbon to simple animal 2015-03-14 23:40:57 +01:00
phil235 1e720ae033 More work on living/life.dm(), simple_animal/life() and robot/life(). 2015-03-14 16:30:59 +01:00
MrPerson 9038fb15af Code cleanup
Removed a bunch of unused or hardly used vars on /mob and /atom/movable.
Added defines for mob/living/var/mob_size so it's not using magic numbers.
2015-03-13 10:41:00 -07:00
Mandurrrh fb099a64e7 Adds a cyborg upgrade module for the satchel of holding. Also fixes the diamond drill upgrade for borgs not being able to equip the drill with upgrade. 2015-03-12 23:26:02 -04:00
phil235 29609457f5 Makes the message when you're attacked slightly bigger for better visibility."
Changes two "for... show_message()" into "visible_message()".
2015-03-12 23:15:54 +01:00
MrPerson 692cfa4f1f Pulling icon en-speedening
Made the little pulling icon on the bottom right corner of your screen update right away when you start or stop pulling instead of updating as part of life(). Or Move().
2015-03-10 08:54:12 -07:00
GunHog 97962ba59b Fixes "Sensor Augmentation" showing in silicon verbs
- Fixes #8167
2015-03-09 08:47:38 -05:00
phil235 282d0231e0 WIP moving carbon/life to living/life() 2015-03-08 16:22:41 +01:00
Remie Richards 04dcfaddcf Merge pull request #8135 from Miauw62/adminjumpfixes
Fixes adminjump being dumb.
2015-03-07 18:17:41 +00:00
Miauw f84f6aafcd Fixes adminjump being dumb. 2015-03-07 19:00:48 +01:00
MrPerson 24dcf08b2e Merge branch 'master' of https://github.com/tgstation/-tg-station into alert_alert_ur_a_faget
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	icons/mob/screen_alien.dmi
2015-03-02 12:04:38 -08:00
MrPerson 8ffbc1be14 On screen alert system
Replaces some of the hardcoded HUD icons defined at mob level with a pair of mob procs throw_alert() and clear_alert(). Alerts will appear on the top-right side of the screen.
You can shift-click alerts to get a description of what's wrong and sometimes a tip on how to solve the alert.

Alerts can be given a master, which overlays the master on top of a box and forwards clicks of the alert to that master. Getting buckled will put an alert of what you're buckled to, for example. If it's a chair, you just click the alert and you're unbuckled. The idea I'm shooting for is to replace resist entirely with this kind of stuff.

Making a new alert and using it is a little complicated. This explanation will suck, but this is simpler than I'm making it sound, I promise. Throw_alert() has 4 args, category, id, severity, and obj/new_master. If you don't supply an id, category will be used as id. Only 1 alert per category is allowed; any duplicate will be replaced. Additionally clear_alert() clears alerts by category. Id MUST match a type path of /obj/screen/alert/[id]. That type path is where the alert's name and desc come from. The icon_state of the alert will either be "template" if new_master is set or [id][severity] otherwise. new_master is totally optional.

Examples:
throw_alert("oxy") -- takes name/desc of obj/screen/alert/oxy, icon_state = "oxy" -- clear_alert("oxy")
throw_alert("nutrition","fat") -- takes name/desc of obj/screen/alert/fat, icon_state = "fat" -- clear_alert("nutrition")
throw_alert("nutrition","starving") -- takes name/desc of obj/screen/alert/starving, icon_state = "starving" -- clear_alert("nutrition")
throw_alert("temp","cold",1) -- takes name/desc of obj/screen/alert/cold, icon_state = "cold1" -- clear_alert("temp")
throw_alert("temp","cold",3) -- takes name/desc of obj/screen/alert/cold, icon_state = "cold3" -- clear_alert("temp")

If you pass a new_master, id is only used to get name/desc and still must match a path, but the icon_state is "template" and icon is from the mob's ui preference instead of icons/mob/screen_alert.dmi.

Several unused icons removed, like borg oxygen and temperature alerts. Also some icons were used but now are not and were removed, like the nutrition icon for being well-fed and cyborg charge icon for being fully charged.
2015-03-01 17:31:26 -08:00
Swag McYolosteinen c6866b0369 Merge pull request #7881 from paprka/sayycode
Bolded yelling and missing green span
2015-02-26 17:59:17 +01:00
Remie Richards b1ff6b7220 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
Conflicts:
	code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +00:00
Swag McYolosteinen 984b7cb8f6 Merge pull request #7738 from Incoming5643/mediborg_inbuiltstretcher
Mediborg Improvement Drive: Roller Robo Da
2015-02-23 17:10:43 +01:00
hornygranny c0c8a739e2 Merge pull request #7721 from paprka/miening
Mining & mine-related chem changes
2015-02-22 20:17:24 -08:00
paprka e68a4027b2 double exclaimation points 2015-02-22 03:50:40 -08:00
paprka 964544d16b bolded yelling and missing green span 2015-02-21 04:17:55 -08:00
Remie Richards 5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
hornygranny 90e0a00298 Merge pull request #7786 from phil235/SiliconGrabFix
No more silicon grabbing.
2015-02-18 21:48:30 -08:00
Cheridan 1ac0c26655 Merge pull request #7770 from phil235/AnimationsFix
Floating animation and life() fixes.
2015-02-18 02:27:28 -06:00
phil235 dcd20969a7 Merge pull request #7730 from Incoming5643/mediborg_tools
Mediborg Improvement Drive: Tool Time
2015-02-17 19:11:28 +01:00
phil235 e09dd08054 Remove aliens grabbing silicons. 2015-02-17 18:03:24 +01:00
phil235 df107499d1 No more silicon grabbing. 2015-02-17 14:59:12 +01:00
phil235 05e3c305ef Fixes floating animation not updating correctly.
Makes life() procs more object oriented.
2015-02-16 18:56:57 +01:00
paprka b2071bfdbf borg updates 2015-02-14 17:38:17 -08:00
Incoming d53163bded Adds an onboard roller bed dock that the mediborg can deploy wherever they need for on the spot triage/transportation/surgery/kidnapping. It can only hold one roller bed, but starts with one. This isn't regeneratable, so you can be a dick and steal the borg's bed and they'll have to go back to medbay for a replacement. 2015-02-14 17:52:38 -05:00
Incoming bc2c692825 Adds a full assortment of surgery tools to the mediborg
Mediborgs won't accidentally slice up people if they use the wrong tool
Mediborgs won't fail surgery steps
2015-02-14 14:04:26 -05:00