Commit Graph

52 Commits

Author SHA1 Message Date
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
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
Iamgoofball b7adce753a Fixes unreported bug with clf3, changes the brainloss in heart attack to do 1 brute instead of 10 brain, makes health scanners show heart attacks. 2015-03-18 20:33:03 -07:00
phil235 456a64f8fd slime from carbon to simple animal 2015-03-14 23:40:57 +01: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
xxalpha f9ebb2cff7 Merge remote-tracking branch 'upstream/master' into traymesons
Conflicts:
	code/modules/research/designs.dm
	icons/mob/eyes.dmi
	icons/obj/clothing/glasses.dmi
2015-02-27 21:15:01 +00:00
Iamgoofball e24e94544e Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
Conflicts:
	code/modules/food&drinks/food/snacks_meat.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
	icons/obj/drinks.dmi
	icons/obj/food.dmi
2015-02-20 22:00:53 -08:00
xxalpha 2284954409 Increase the range of t-ray scanner pulse. 2015-02-14 19:45:08 +00:00
phil235 135293bedf Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.
Fixes Alien embryo processing that was processed twice.
2015-02-14 14:18:49 +01:00
Iamgoofball 99cab4ddcb Changes 2015-02-13 18:05:03 -08:00
Iamgoofball 575b117a70 Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
Conflicts:
	icons/obj/drinks.dmi
2015-02-10 21:37:49 -08:00
Iamgoofball eea438c42d Literal shitton of changes 2015-02-07 15:37:55 -08:00
Menshin e154d69b0b * Fixes warnings related to add_reagent when trying to inject blood containing reagents
* Fixes sleepers showing reagent id instead of name
* Some formatting adjustments to the mass spectrometer output

* Make the "Saline-Glucose Solution" name fit in one line.
2015-02-07 16:32:25 +01:00
paprka d9f49a4eb5 colon and locate() for blood 2015-01-25 16:53:12 -08:00
paprka f071655ea4 updates and optimizations 2015-01-24 01:12:57 -08:00
paprka 13070880cb adds IV drips 2015-01-21 16:00:57 -08:00
Iamgoofball bc9d48fa42 Mutadone and Mannitol, tweaks and changes. 2015-01-16 19:28:13 -08:00
Iamgoofball f3398e58a9 Removes Star Trek chemistry and transfers us to Goon Chemistry. 2015-01-16 17:21:36 -08:00
carnie a3f5e7ebfd Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm
2015-01-04 01:52:14 +00:00
carnie a029a49392 SubSystem rewrite
Misc:

+Fixes unreported issue with initializing lighting on a specific zlevel

+Fixes two similar issues with moveElement and moveRange. Where fromIndex or toIndex could be adjusted incorrectly in certain conditions. Potentially causing bad-sorts, or out of bound errors.

+Rewrites listclearnulls(list/L) to no longer iterate through L.len elements for every null in the list (plus 1). i.e. went from L.len*(number_of_nulls+1) list-element reads (best-case), to L.len list-element reads (worst-case)

+New proc/getElementByVar(list/L, varname, value) which finds the first datum in a list, with a variable named varname, which equals value. You can also feed it atoms instead of lists due to the way the in operator functions.

+Fixes an unreported issue with Yota's list2text rewrite. Under certain conditions, the first element would not be converted into a string. Causing type-mismatch runtimes.

+New global map_ready variable. This is not fully implemented yet, but will be used to avoid duplicate calls to initialize() for map objects.

+All turfs now maintain references to all lights currently illuminating them. This will mean higher memory use unfortunately, due to the huge number of turfs. However, it will speed up updateAffectingLights significantly. I've used list husbandry to reduce baseline memory usage, so it shouldn't be any worse than some past atmos modifications memory-wise.

-Removed 'quadratic lighting', can add this back at some point. Sorry.

+modified the way lum() works slightly, to allow turfs to have overridden delta-lumen. i.e. space cannot be illuminated more than its default ambiance. This allowed removal of some iffy special-snowflake lighting areas implemented by somebody else.

+Lighting images in the dmi can now use arbitrary naming schemes. It is reliant on order now. This allows the dmi to be replaced by simply dropping in a new dmi.

-Removed all subtypes of /area/shuttle. Shuttles now create duplicate 'rooms' of /area/shuttle. (More on this later). This will conflict with most maps. Guide on how to fix to follow.

+All verbs/tools relating to world.tick_lag were refactored to use world.fps. However old config text for setting tick_lag will still work (it converts the value to fps for you)

+MC stats improved using smoothing. They now have their own tab so they dont get in the way when you're playing as an admin.

-removed the push_mob_back stuff due to conflicting changes. Sorry Giacom.

_OK, NOW THE ACTUAL INTERESTING STUFF_

Following systems moved over to subsystem datums:
air_master
garbage_manager
lighting_controller
process_mobs (aka Life())
nanomanager
power
sun
pipenets
AFK kick loops
shuttle_controller (aka emergency shuttle/pods), supply_shuttle and other shuttles
voting
bots
radio
diseases
events
jobs
objects
ticker

Subsystems hooks and variables should be commented fairly in-depth. If anything isn't particularly clear, please make an issue.

Many system-specific global variables have been refactored into

All tickers which previously used world.timeofday now use world.time

some subsystems can iterate before round start. this resolves the issue with votes not working pregame
2014-12-31 13:25:41 +00:00
Razharas 21a2c2d21e Made clumsiness into disability
I really dont want to make clumsy_act()
2014-12-14 08:04:48 +03:00
Razharas 0921aa201f Added datum mutations
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
2014-12-12 04:48:11 +03:00
Remie Richards 2054cbda08 Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human_attackpaw.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
2014-11-08 01:07:29 +00:00
phil235 128c9222e5 Adding checks for stun, restrained to many object verbs.
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
2014-11-01 19:18:01 +01:00
Remie Richards fa184f5487 Cuts /disease variables from 28 to 23 (includes new ones)
a disease may now have more than one spread type
added "infectivity" variable which replaces a prob(65), defaults to 65
affected_species is now viable_mobtypes, and lists typepaths, this is due to us actually having a species system now so it's confusing
adds defines for a bunch of stuff
2014-10-30 06:21:14 +00:00
phil235 1d9834b159 Adding changelog and correcting a typo 2014-09-25 20:06:01 +02:00
phil235 b00b41bbf9 Replacing clone damage descriptions by "cellular damage". 2014-09-25 19:11:31 +02:00
Cheridan 7a32582db9 Merge pull request #4745 from Perakp/miningScanner
Mining scanner scans automatically, similar to t-ray scanner.
2014-09-19 09:43:32 -05:00
Remie Richards 473bcd1858 Ports Drones from NTstation + New Improvements/Features 2014-09-13 15:02:57 +01:00
Perakp 3a3f703ed9 Mining scanner scans automatically, similar to t-ray scanner.
Cooldown increased for balance/ to not have the flashing ores be too annoying.
2014-09-08 15:00:37 +03:00
CollenN 2aab5fa71c Finalizes Mutantrace Datum Update
https://github.com/tgstation/-tg-station/pull/3609

Squashes the commits from the above pull request. Should hopefully be a
lot less cluttered.
2014-06-19 17:42:14 -04:00
Kelenius 584a014a12 Hopefully last change 2014-05-18 22:46:32 +04:00
Kelenius a576cb7fea Part 2 2014-05-18 21:42:20 +04:00
Kelenius ed5f8a0ee6 Fixes, part 1 2014-05-18 21:27:40 +04:00
Kelenius 3f1574a475 Added slime scanner
Much less nutrition consumed, but they actually use it to grow
Made mutation chance random between 25 and 35
Slime core reactions use 1 unit of reagent
Code cleanups
2014-05-01 14:51:26 +04:00
Ergovisavi ac269baacb Fixes bullet_act not checking for damagetype on many, many objects.
Replaces Holodamage with Stamina damage, if your stamina damage exceeds your current health, you get weaken(5)'d. Stamina heals itself slowly over time.
Makes the hallucination enemies deal more stamina damage than they did holodamage, but stamina damage heals now so it's mostly for just seeming threatening at the moment.
Adds the Disabler, a gun that does stamina damage. It has a range of your screen, but no more. Adds a disabler crate to cargo (security lock)
Fixes Lasertag ED209's because they were busted as shit
Reduces ED209's view range to 9 from 12, which was several times longer than your screen view, now is only a little bit more
Lastertag now does stamina damage instead of an instant stun for that GRITTY LASERTAG EXPERIENCE
2014-03-01 16:39:22 -08:00
Hornygranny 2134add41b Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range. 2014-02-17 15:44:07 -08:00
Hornygranny 9e14c22747 Reduces throwspeeds on all items to realistic levels. 2014-02-15 19:58:03 -08:00
hornygranny e0d0cedf36 passed over everything with throwforce 2014-02-13 18:06:50 -08:00
Cheridan bb9c09df46 Obsoletes flags = FPRINT | TABLEPASS*
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.

Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.

If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only  where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
Kyrah Abattoir 225a906eda code/game/objects/items/* (root) lowercase pass
code/game/objects/items/devices/* lowercase pass
2013-11-20 19:15:00 +01:00
Robson Richards 1c70008d0c Changes Limbs into Obj's
Reworked all the paths for it
Reworked all the procs for it
2013-10-11 19:11:55 +01:00
carnie e7b586a095 Replaced organ helper procs with a single more versatile and strealined one. 2013-08-01 14:42:32 +01:00
Giacomand 3471ee8404 Updated the message you get after trying to analyze the floor. 2013-07-10 07:09:05 +01:00
Giacomand 2496684ff2 Burns to Burn, to be more consistent. 2013-07-04 13:36:05 +01:00
Giacomand ce0b115b5d Updated the health analyser interface to be more usable.
Cleaned up the code.
 Removed the copy and paste of the PDA medical scanner.
 Removed monkey gamemode checks.
 Removed the unused PDA detective scanning code.
2013-07-04 13:31:06 +01:00
Pete Goodfellow e4bce0bb14 Replaced most reagent initialisations with the helper proc create_reagents(). 2013-04-15 15:40:33 +01:00
d_h2005@yahoo.com a5bec908b0 -Renames experimental weapons crate to incendiary weapons crate. It was being confused with the experimental energy gear crate (and truthfully there's not much that's "experimental" about a flamethrower an engineer can make in 2 minutes from scrap parts)
-Changes some other item names and descriptions.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5717 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-16 18:20:49 +00:00
petethegoat@gmail.com 75a7d34ec9 Committing datum based surgery proper. There's a brief explanation in surgery.dm, if you want to know how it works.
Basically, surgeries are now initiated by bedsheets or surgical drapes, and consist of separate steps.
Appendicitis is sort of hacky, but it should work for now. I'll update it when I add processing organs.

Added getbrain() and getappendix() procs, which can be used instead of checking the old (now missing) x_op_stage variables.

Added a surgical apron, using old sprites by matty.

Updated the map:
Removed the note with spell descriptions from the wizard's den for Kor.
Updated the operating room.
Updated xenobio to have appropriate tools for slime surgery.

Path changes:
/obj/item/brain > /obj/item/organ/brain
/obj/item/weapon/reagent_containers/food/snacks/appendix > /obj/item/organ/appendix
/obj/item/weapon/reagent_containers/food/snacks/appendix/inflamed > /obj/item/organ/appendix


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5703 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-14 01:20:58 +00:00
petethegoat@gmail.com a1ac5f0e66 Renamed /datum/organ/external to /datum/limb.
Updated all files.

Removed the skeleton and skin organs.

Updated WIP surgery.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5689 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-11 18:52:33 +00:00