Commit Graph

20 Commits

Author SHA1 Message Date
Tad Hardesty
54630b7c48 Remove NODROP from water tank misters (#32995) 2017-11-24 06:05:30 -05:00
Emmett Gaines
7c69cdcb8a Revert math (#33059)
* Revert "all this wrapping and it's not even christmas (#33035)"

This reverts commit faaf151580.

* Revert "fuck me for forgetting to graph this one"

This reverts commit 45d7acea2f.

* Revert "defines math"

This reverts commit 2817a1737b.
2017-11-23 20:59:52 -05:00
ninjanomnom
2817a1737b defines math 2017-11-22 17:36:58 -05:00
ShizCalev
02abe5d92f Makes drinking glasses smash when thrown (#32890)
* Makes drinking glasses smash when thrown

* Maintains bartender snowflake behavior

* Extended to all bottles, cartons, cleaned up 1 & 0

* Corrected breaking bottles on heads.

* Reduced glass spawn chance to 33%
2017-11-20 09:45:08 +01:00
kevinz000
caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
as334
f71595a3e2 Assmos tweaks/minor additions. (#32400)
* Adds pluoxium formation, makes fusion radioactive and nerfs it, makes noblium cost more energy.

* Review response.

* tanks now melt above 1 Million degrees Kelvin.
2017-11-10 01:30:36 -06:00
AnturK
83e177e43c 512 experimental (#31251)
* 512 update

* Travis update

* Fixes mass replace mixup
2017-10-28 17:20:04 -04:00
Jordan Brown
04c05d8e5c Adds defines for organ slots (#31737) 2017-10-15 20:33:35 -04:00
duncathan salt
454d16fe32 Minor refactor of how gas IDs are handled (#31528)
* gas IDs -> gas datum paths

* updates parse_gas_string() to handle both paths and IDs

* fixes compile errors

* fixes parse_gas_string() ignoring amounts of gas

* fixes roundstart jetpack runtimes

* fixes filters

* fixes map-edited filters

* fixes empty canister runtimes on initialization
2017-10-11 15:04:12 -04:00
vuonojenmustaturska
890ba9dbe1 Imminent danger of skeletons
* Renamed GASLIST into ADD_GAS
* Reordered ASSERT_GAS arguments around
* Replaced all instances of add_gas with the define
* Removed once instance of manual duplication of ASSERT_GAS with the real deal
2017-10-07 04:34:24 +03:00
vuonojenmustaturska
feabd41900 Always be alert for skeletons 2017-10-06 20:33:42 +03:00
Firecage
ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage
2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
RandomMarine
f2c803965a Back and inhands for air tanks 2017-09-27 17:33:21 -07:00
RandomMarine
98ed3d0927 Air tanks get their own sprite + reset fix 2017-09-25 19:25:06 -07:00
ShizCalev
39380d5b03 Removes old debug text 2017-09-19 18:56:39 -04:00
shizcalev
eb935d829e Tank gauge fix 2017-09-14 22:16:07 -04:00
Ergovisavi
9fb70f22d8 ATMOS Resin removes iciness from floors (#29967)
* atmos resin now makes the floor non-slippery, increased the turf coverage of resin by one unit

* Atmos resin removes wetness on floor tiles upon generation
2017-08-22 14:30:23 +12:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00