Commit Graph

426 Commits

Author SHA1 Message Date
Pete Goodfellow
af4849ce72 Updated all suicide_act()s to use a new span class, 'suicide'. 2014-01-19 16:46:37 +00:00
Cheridan
b4f1e03341 Merge pull request #2285 from ChuckTheSheep/Botany
Irrigation Botany Changes
2014-01-18 12:12:38 -08:00
Razharas
dc498dc1ea Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker 2014-01-18 23:31:51 +04:00
Jittai
5d51eb65e3 FindConnected Fix
FindConnected was using src in getstep instead of "a" the processing atom.
2014-01-17 19:06:11 -05:00
Jittai
70729846ab Fixes Icon Update Issues Found 2014-01-17 18:56:28 -05:00
Jittai
cf8871342a Whoops 2014-01-17 18:33:05 -05:00
Jittai
f9cd65e424 Fixes Order of Operations 2014-01-17 17:20:41 -05:00
JJRcop
36a346c367 Changes drying rack to use color var and removes "_dry" icons
Removed watermelon's dried_state
Puts cigarette reagent code in a proc
2014-01-17 11:26:24 -05:00
Rolan7
50387aa9d4 Eggyseeds set to 0 rarity because they're in "exotic seed" crates from CentComm. 2014-01-16 17:33:28 -05:00
Rolan7
d7e77c44bc Updated a bunch of \blue and \red to span tags.
Moves the seed check into the original loop along with plasma since sorting the seed list wasn't worthwhile.
2014-01-16 15:44:56 -05:00
Rolan7
72ee3703fb Switched to an associative list for the list of discovered plants.
Removed a grown-species lines I had commented out and forgotten to remove.
2014-01-16 03:11:52 -05:00
Rolan7
aa21029431 Merge branch 'master' of https://github.com/tgstation/-tg-station into HydroCargoPoints 2014-01-16 01:21:33 -05:00
Rolan7
86c8b8ffa7 Fixes the species property for grown items by removing it (it wasn't being set by slimes or spawn, and was pointless).
Removes some debug lines.
Puts the shuttle timer back to 1200.
2014-01-16 01:20:56 -05:00
JJRcop
6e55f3e50b Fixes some issues with rollie paper packs and incorrect icon state names 2014-01-15 16:04:07 -05:00
Giacom
42551d54e7 Merge pull request #2138 from Cheridan/hydro
[501] Hydroponics Plant Size Scaling
2014-01-15 10:16:04 -08:00
Rolan7
e3bdac9a95 Adds a rarity value to seeds. CentComm gives points for rare seeds, and for high-potency samples. 2014-01-15 03:37:10 -05:00
Razharas
93f8cac80a Semi-final update
Moved microwaves, biogenerators and R&D console to newer ui(not the nano
one)
One more deneric machine proc for unwrenching stuff
What didnt done: SMESes and hydro trays
Maybe all add them in the final update, maybe not, im not sure
2014-01-15 03:46:41 +04:00
ChuckTheSheep
f910bb55bb Fixed the runtime error stopping the whole code 2014-01-14 14:23:45 -05:00
Razharas
87f137766c Standartization and more issues fixing
More standart machinery procs
More sprites
Constructable mech rechargers
Over all tide up

Its not over yet folks, next are coming constructable kitchen machinery
and SMESes, update to newer uis, even more standartization and maybe
some more R&D content
Stay turned
2014-01-14 02:42:07 +04:00
Razharas
195c85dc54 And some more issues
Returned gia's telesci interface
Fixed some mistakes and bugs
Also some more sprites
Deleted(i fucking hope) accidental investigate log
2014-01-12 03:11:20 +04:00
Razharas
551a7ab0a3 Issues fixing
Added biogenerator and freezer/heater
Fixed issues gia pointed out
Added some lost sprites
2014-01-11 00:56:28 +04:00
ChuckTheSheep
ca2cfd24d7 Fixes issues with the icons and the update_icon() 2014-01-08 20:46:53 -05:00
ChuckTheSheep
d82d615f69 Damn it Gia 2014-01-08 19:43:17 -05:00
ChuckTheSheep
b77cdfd09d Indention Fixes 2014-01-08 18:55:13 -05:00
ChuckTheSheep
7c4ba2d9a5 Fixes/Refining 2014-01-08 17:45:54 -05:00
ChuckTheSheep
3570f73105 Irrigation Botany Changes
Screwdriver to hook up hoses in between anchored trays. If the transfer
amount is over 30 it sets off the irrigation and the units are equally
shared between all the connected trays.
2014-01-08 09:02:27 -05:00
JJRcop
b82af39ed1 dds Drying Rack, Various Plants, Rollies, Pipes, and Torches
Any and all content credit to @Adrinus and @Iamgoofball
I simply re-applied all the changes by hand so it is compatible with current code
 #1893
2014-01-07 15:40:49 -05: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
Giacom
38e0ae8848 Merge pull request #2019 from Jordie0608/Dogmas
Added reindeer hats
2013-12-23 04:18:42 -08:00
Razharas
5f459cd834 Fixes soil being wrenchable 2013-12-19 00:08:48 +04:00
Razharas
358a85eb3d Completed the transition to a new proc
All the logging i have found in the code was changed to use the
proc(maybe i missed something)
Killed all runtimes found so far
Proc now handles all the checks, no need to add checks in the body of
object
2013-12-17 22:56:04 +04:00
Jordie0608
9197bff4dd Added reindeer hats for humans and corgis 2013-12-11 16:11:01 +11:00
Cheridan
f96755857d The plant that grows .357 revolvers. 2013-12-08 13:32:33 -06:00
Aranclanos
8251c0ea42 Merge branch 'HydroTweaksNov2013' of https://github.com/Rolan7/-tg-station into HydroTweaksNov2013
Conflicts:
	html/changelog.html
2013-12-08 06:29:48 -03:00
Rolan7
530dd03286 Making astroturf and sandstone now automatically stacks all the produced items. 2013-12-04 18:44:49 -05:00
Aranclanos
d4a4a817d4 Merge pull request #1922 from TZK13/Mushroom-Adjustments
Adjustments to mushrooms
2013-12-02 12:41:34 -08:00
Rolan7
2cbe155988 Made my mark upon the changelog! Also added streamlined grass-preparation from sandstone code. 2013-12-01 21:24:29 -05:00
Rolan7
3e642f7adc Merge branch 'master' of https://github.com/tgstation/-tg-station into HydroTweaksNov2013 2013-12-01 21:04:20 -05:00
Giacom
9422233976 Merge pull request #1926 from VistaPOWA/begone_debug_message
Removes an annoying debug(?) message from hydroponics.
2013-11-30 17:23:24 -08:00
Rolan7
aa18fb79d1 Fixed a bug where uranium wasn't dealing health damage. Made the mutation rate for radium and uranium equal for simplicity's sake, but radium adds more toxicity. 2013-11-29 09:10:22 -05:00
Rolan7
e3d2f9ffe7 DONE Leather gloves now have heat protection like black gloves (to allow removing lights bulbs/tubes)
DONE	Plants require 4 light, mushrooms only 2
DONE	Harvesting should report how many items were harvested (whether plantbag is used or not)
DONE	Plantbag should have a mode to only pick up one kind of plant at a time.  Trash and ore bags too.
DONE	1 unit of mutagen should cause non-species mutations.  (Radium too)
DONE	Uranium should be like radium but even weaker
2013-11-28 23:07:50 -05:00
TZK13
ce063d78cf Returned the amount of sleep toxin in reishi back to what it was before. 2013-11-28 14:17:08 -06:00
VistaPOWA
abb2b6bdf6 Removes an annoying message from hydrophonics.
It's been bothering me for some time., it looks out of place and it's
not like that the botanist won't notice it. (No idea why some empty
lines were modified)
2013-11-28 20:19:24 +01:00
TZK13
e4de436a1e Renamed psilocybin to mushroom hallucinogen, removed psilocybin/mushroom hallucinogen from huge mushroom slice, removed space drugs from reishi, added anti-toxin to reishi and lowered the amount of sleep toxin in reishi. 2013-11-28 00:15:56 -06:00
Cheridan
82a2eb8ae4 Hydroponics Plant Size Scaling!
Plants now get resized, based on their potency!
(Except for logs and sunflowers because they're snowflakes)

screenshot:
http://puu.sh/5iJws.png
2013-11-15 00:48:53 -06:00
JacobLee1
8133912928 Ambrosia wreaths
Lets you put ambrosia leaves on your head, olive wreath style. Cue SS13
Olympics. Hopefully security doesn't beat you up and confiscate it.
http://i.imgur.com/58aEHUw.png
2013-11-13 17:53:45 -06:00
Miauw
5ad9505ef4 [MAP]Fixed space-fastening properly.
Conflicts:
	code/modules/power/singularity/field_generator.dm
	maps/tgstation.2.1.2.dmm
(What is this I don't even)
2013-11-09 14:42:54 +01:00
supersayu
799c7ad2ce Replaces atom/HasEntered() with the builtin atom/movable/Crossed()
Crossed() is a byond builtin which is called automatically when two movable atoms overlap (as a side effect of Move(), but not when loc or x/y/z is changed).  Previously, turf/Entered() iterated through all objects in the turf in order to tell them an object had entered; with this change, HasEntered() becomes redundant and can be eliminated.

This may reduce lag when a large number of objects are moving in a small space (singularity, mining conveyors, etc) but should cause no changes to functionality at all.
2013-10-23 16:20:20 -04: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
Mloc-Argent
9de132a0a3 Small fixes and a new atom flag.
* Fixes the ( shaped cyan wire
* Fixes a luminosity bug with glowshrooms.
* Changes a ridiculous internal loop in intercoms to use the MC.
* Makes intercoms not be bloodied by bloody hands.
* Adds a "NOBLOODY" flag for atoms that don't want to be bloodied.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 20:15:55 +01:00