Commit Graph

231 Commits

Author SHA1 Message Date
phil235
d5a7d82959 Fixes a lot of "the the" in messages. 2014-12-16 22:59:55 +01:00
phil235
7bd9b86652 Changes the hunger system in various ways. New hunger hud icons. Food w/o sugar can be loaded in snack vending machines by anyone. Adding two new var for mobs "satiety" and "metabolism efficiency". Rearranging datum/reagents, all "good" medical reagents are under datum/reagent/medicine/ and all food&drink reagents are under datum/reagent/consumable. Adding a pizza crate to cargo orders. Growns and cooked food are given vitamins while junk food are all given sugar. Removed some unnecessary code in Chemistry-Reagents.dm .
high satiety+fed = higher metabolism_efficiency, lower if starving. Sugar digested drains satiety and vitamin raises satiety. Negative satiety means faster nutrition drop. Positive high satiety means lower chance to spread viruses. metabolism efficiency affect metabolization speed of healing and damaging reagents and the efficiency of bodytemp stabilization via calory use.
2014-12-11 20:46:27 +01:00
tkdrg
e2c15d5210 Merge branch 'master' of https://github.com/tgstation/-tg-station into hudwhyyoudothistome
Conflicts:
	code/modules/hydroponics/hydroponics.dm
2014-12-08 13:48:22 -03:00
Swag McYolosteinen
609807df75 Merge pull request #6199 from Ergovisavi/less_terrible_human_plants
Pod Cloning changes
2014-12-07 17:34:54 +01:00
tkdrg
3e97e935af /datum/atom_hud (Passive HUDs) bugfixes
Moves antag_hud image and datum to mind instead of mob.

Fixes mobs keeping data HUDs after transfer_to().
Fixes gibbed bodies losing their antag HUDs.
Fixes the data hud disappearing when dropping unrelated HUDs.

Fixes #6206
Fixes #6209
2014-12-06 15:05:23 -03:00
Remie Richards
8eced8d302 Merge pull request #6134 from Menshin/null_loc_mobs_fix
Prevent some mobs from spawning in nullspace
2014-12-03 16:39:30 +00:00
Ergovisavi
ff5b845371 Some changes to Blood and Replica Pods, adds more vars for allowing Replica pods to clone without an intact body, sets replica production to 1 for faster cloning, makes you a plantman/woman 100% of the time 2014-12-03 06:29:49 -08:00
Menshin
76ecd457b1 Killer tomatoes :
* Prevent killer tomato from spawning inside nullspace
* It's now impossible to eat an awakening killer tomato
* Fixed been able to spawn lots of killer tomatoes by spam clicking the tomato object

Drones :

Prevent an edge case which would lead to a client spawning as drone in null space

Brains :

Makes brainmobs qdel instead of piling up inside the brain object
2014-11-28 23:24:12 +01:00
hornygranny
21b8df82d5 Merge pull request #5908 from tkdrg/hud
Makes data and antag huds passive and creates /datum/atom_hud
2014-11-25 12:53:03 -08:00
hornygranny
4702f16ecb Merge pull request #6037 from tkdrg/imdumb
Fixes hydroponics harvesting in diagonals
2014-11-24 21:05:17 -08:00
tkdrg
90b3fed5df Fixes hydroponics harvesting in diagonals 2014-11-24 20:14:57 -03:00
phil235
3436b96693 Fixes the runtimes when picking up nettles as a non-human. Changing two span class. Maintenance drones no longer take damage when picking up nettles. 2014-11-23 16:09:36 +01:00
tkdrg
3bb478f12f Includes antag HUDs in the datum hud overhaul
Makes hud_list associative, and introduces the /atom list hud_possible,
which lists all the possible hud images a certain atom can provide.

Replaces all the awful procs in the gamemodes with their new
/datum/atom_hud versions, which are much shorter, simpler and faster.
2014-11-20 15:43:51 -03:00
tkdrg
0db30a6534 Fixes issues with TK teleporting pictures and harvested plants. 2014-11-18 15:49:03 -03:00
Jordie0608
590684e129 Merge branch 'master' of https://github.com/tgstation/-tg-station into beekeepermodewhen
Conflicts:
	icons/mob/animal.dmi
	tgstation.dme
2014-11-09 00:15:12 +11:00
hornygranny
2b8045ebe0 Merge pull request #5494 from phil235/BiogenFullFix1
Biogenerator container fix
2014-11-03 17:23:41 -08:00
xxalpha
5211f7ffbb Tweaked 2014-10-29 20:44:58 +00:00
xxalpha
a85e0d8613 Adds a variation of the clown shoes
Sprites and tweaks

Add clown-locker with banana shoes to clown shutle

Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm

Adds clown new shoes to map

DME
2014-10-29 19:22:11 +00:00
phil235
219ea4f2e2 * Trying to make milk or cream with the biogenerator while its container doesn't have enough space no longer uses any points and gives an error message instead.
* Remove an unused var and argument.
2014-10-27 17:12:17 +01:00
phil235
2bb61534dd Removing an unused var and argument. Container now checks if there's enough space to hold all the reagent. 2014-10-27 17:01:53 +01:00
phil235
d1dbcbe203 Trying to make milk or cream with the biogenerator while its container is full no longer uses any points and gives an error message instead. 2014-10-27 16:33:55 +01:00
paprka
c4668885ec Merge branch 'master' of https://github.com/tgstation/-tg-station into cooljackets
Conflicts:
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
2014-10-20 21:38:39 -07:00
paprka
74dfbeb92c adds bomber and leather jackets 2014-10-20 21:36:40 -07:00
Incoming
1212180556 Returns the missing grassclump icon
Introduces the improvements added to grass in #5253 to carpets
2014-10-18 20:58:07 -04:00
Cheridan
1b8c69324f Merge pull request #5075 from Incoming5643/FuckIKEA
Carpet is now growable, whoa!
2014-10-16 23:00:07 -05:00
phil235
d66b0e61f0 Fixes the ability to make stacks of grasstile/sandstone larger than the max amount authorized.
Fixes an error in the amount of grasstiles produced.
Fixes some unnecessary capitalisation in mineral deposit names.
2014-10-14 21:22:08 +02:00
Cheridan
08be1b34eb Revert "Changes a few green crosses to blue on sprites that I missed last time" 2014-10-04 19:22:10 -05:00
Incoming
5952f82618 Carpet is now growable, whoa!
It's mutant grass, wow!
Now you can stop stealing it for your sweet construction projects, nice!
2014-10-03 19:53:44 -04:00
ikarrus
7c32420497 Resolved conflicts and added my yml changelog file 2014-09-19 09:30:59 -06:00
ikarrus
53dd04466f Golems created by runes also get the same treatment 2014-08-31 17:51:39 -06:00
ikarrus
759ca4979c Clones and Podmen will no longer be created with underwear already on. 2014-08-31 16:49:36 -06:00
Alex
4e7c2cbb8e Merge pull request #4623 from phil235/WaterLightFix
Fix low water light on hydrotray
2014-08-31 20:55:41 +01:00
phil235
f4c38c6b86 Fix low water light on hydrotray
one single space...
2014-08-31 21:53:26 +02:00
ikarrus
51a333ebe7 Merge gang mode into latest version 2014-08-30 23:31:44 -06:00
ikarrus
4c801434a8 Gang Mode 2014-08-30 23:17:14 -06:00
Firecage
6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
Firecage
dac8669166 Span classes for files in the following module folders: assembly, client, detectivework, events, hydroponics, mining, paperwork 2014-08-23 10:13:21 +02:00
Cheridan
792ada6990 Merge pull request #4123 from Rolan7/Issue_4045
Glowshroom and irrigation fix
2014-07-21 08:40:38 -05:00
Alex
1e35eb0458 Merge pull request #4186 from Ergovisavi/killer_tomato_parasite_fix
Fixes issue #4185 - Killer tomatos spawning in mobs/mechs/microwaves/etc
2014-07-21 09:05:21 +01:00
Firecage
fd5c599d2f Merge branch 'Biogencode' of https://github.com/Firecage/-tg-station.git into Biogencode 2014-07-20 21:38:01 +02:00
Firecage
ad5ad41d98 Changes what Miauw said
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-20 21:36:19 +02:00
Firecage
5a463fafac Update biogenerator.dm 2014-07-20 21:23:58 +02:00
Firecage
7779a2f7e8 Signed-off-by: Firecage <firecage@hotmail.com> 2014-07-20 21:10:53 +02:00
Ergovisavi
fa32b63189 Fixes issue #4185, Killer Tomatos will now spawn on the turf that the Killer Tomato plant exists in after the awakening process, stopping bizarre things like it spawning inside another mob or in a mech or other assorted silliness 2014-07-17 21:50:47 -07:00
Firecage
76e9fed50c Signed-off-by: Firecage <firecage@hotmail.com> 2014-07-15 22:36:54 +02:00
Firecage
07a16bbbf7 Signed-off-by: Firecage <firecage@hotmail.com> 2014-07-14 06:06:04 +02:00
Firecage
4db7359cf6 Signed-off-by: Firecage <firecage@hotmail.com> 2014-07-13 22:34:44 +02:00
Firecage
e13e4ca445 Signed-off-by: Firecage <firecage@hotmail.com> 2014-07-13 22:32:34 +02:00
Firecage
d5a7885842 Signed-off-by: Firecage <firecage@hotmail.com> 2014-07-13 22:29:37 +02:00
Rolan7
d84d6e573b Removes wonky luminosity check from soil plots that was causing problems. Was not present in real hydro trays.
Puts the irrigation check back to anchored==2 like it's supposed to be.  Oops.
Comments the anchored variable in a few places so people don't make the same mistake.
2014-07-09 19:40:00 -04:00