kevinz000
68a0eddeaf
Merge pull request #10285 from Ghommie/Ghommie-cit491
...
[s] Fixes singularity pulls duping rods out of engine floors.
2020-01-08 13:31:31 -08:00
Putnam3145
b09ef97ae3
Merge pull request #10305 from BlackMajor/Yeehaw
...
Various Mining borg changes. And some extras.
2020-01-07 16:50:21 -08:00
BlackMajor
05a644cc41
Revert "Merge branch 'master' into Yeehaw"
...
This reverts commit 972c03f79f , reversing
changes made to 8ebd698763 .
2020-01-08 12:26:45 +13:00
BlackMajor
972c03f79f
Merge branch 'master' into Yeehaw
2020-01-08 12:25:50 +13:00
BlackMajor
b41c9cd844
Sync with master
2020-01-08 12:25:22 +13:00
BlackMajor
5a97259ba9
Fix a couple of bugs, add wrapping paper and destination tagger
2020-01-07 15:33:16 +13:00
Lin
f7b91f9b65
Merge pull request #10238 from Ghommie/Ghommie-cit478
...
Brings in some mapping code updates.
2020-01-03 00:01:54 +00:00
Lin
b1ccd512db
Merge pull request #10215 from Ghommie/Ghommie-cit473
...
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
2020-01-03 00:00:51 +00:00
BlackMajor
8085022d97
Couple of changes. Starting on the point bank.
2019-12-31 23:28:30 +13:00
BlackMajor
375e59a77d
Merge branch 'master' into Yeehaw
2019-12-29 22:12:40 +13:00
BlackMajor
206a5e168a
More mining changes
2019-12-29 20:15:49 +13:00
Ghommie
60134ea8ae
[s] Fixes singularity pulls duping rods out of engine floors.
2019-12-25 03:34:42 +01:00
Ghommie
12aa266efe
Missed this one too.
2019-12-19 12:27:30 +01:00
Ghommie
8566e2396d
Brings in some mapping code updates.
2019-12-19 00:44:14 +01:00
Ghommie
5bf252a58c
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
2019-12-17 01:57:56 +01:00
Ghommie
80402a0d88
Ports some hud and update_icon code updates.
2019-12-16 23:29:20 +01:00
Ghommie
e0caf6007b
Fixes space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter...
2019-12-07 04:02:33 +01:00
kevinz000
e2f9a68c2c
Merge pull request #10049 from Useroth/new-tg-plants
...
Colored fairy grass, because fuck your eyes.
2019-12-05 21:43:24 -07:00
Useroth
b9ce4a8622
Oopsie
2019-12-05 01:49:55 +01:00
Useroth
950b884da5
Adds colored fairygrass.
2019-12-05 01:47:42 +01:00
BlackMajor
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
BlackMajor
6f98efb18e
Merge pull request #9902 from Useroth/new-tg-plants
...
[TESTMERGE READY] Ported a bunch of tg hydroponics content.
2019-11-25 11:30:43 +13:00
Useroth
2ced7db508
Ported a bunch of tg hydroponic stuff.
2019-11-21 10:53:57 +01:00
Ghommie
21f15e411d
Part 3
2019-11-19 19:34:42 +01:00
Ghommie
a52e292cc8
Ports "examine-code refactor"... part 1...
2019-11-19 03:28:06 +01:00
Ghommie
641ddebed1
Ports "Uses defines for turf atmos"
2019-11-17 03:19:35 +01:00
kevinz000
3015ec5c04
Merge pull request #9764 from Ghommie/Ghommie-cit335
...
Dreamchecker compatibility changes, part 1.
2019-11-14 01:37:41 -07:00
Ghommie
42d9e3cf51
Porting Robustin's Syndicate Infiltrator PR
2019-11-11 18:49:18 +01:00
Ghommie
1e49ce76d3
Dreamchecker compatibility changes, part 1.
2019-11-10 20:48:30 +01:00
Ghommie
a650e1e411
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
2019-11-05 05:37:28 +01:00
Ghommie
e1928a18f1
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
Poojawa
6d9aa8de70
More carpet options and ways to get them
2019-10-03 22:54:10 -05:00
kevinz000
09ed526594
Merge pull request #9089 from Sishen1542/rapid-construction-dabvice
...
RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier
2019-09-07 11:35:09 -07:00
Sishen
dc66446064
dab dab
2019-08-09 03:19:02 -04:00
kevinz000
df60e21449
Update misc_walls.dm
2019-08-07 00:20:28 -07:00
kevinz000
8cfba8e2ce
Update misc_walls.dm
2019-08-03 00:46:24 -07:00
Ghommie
98418c7f87
[s] ports "Fixes infinite brass generation exploit"
2019-07-04 21:54:20 +02:00
BurgerLua
1bd0ff5ef1
Merge remote-tracking branch 'upstream/master' into RCDMEMES
2019-06-10 16:40:10 -07:00
Ghommie
e6e06a1a43
Makes clockwork wall - sonic jackhammer interaction account the wall's superheating.
2019-06-02 13:59:36 +02:00
BurgerLua
d67b179bff
RCD Memes
2019-05-31 20:32:17 -07:00
Nero1024
2a4a656a4d
Port new footsteps from tg
2019-05-17 18:10:03 -05:00
deathride58
df1decf1b1
Merge pull request #8087 from Trilbyspaceclone/QoL-RCD
...
[MIRROR] fixes some edge cases in rcd building #42960 TG code
2019-03-08 20:46:19 -05:00
Trilbyspaceclone
518bce82c0
Update plating.dm
2019-03-04 16:34:37 -05:00
kevinz000
5f0462b604
Update river.dm
2018-12-20 01:00:36 -08:00
Redtail
629189fdc1
Added Another new carpet, and two tables, and a new cargo crate.
...
Added: monochrome. Two new table sprites for the other new carpet. New cargo supply crate for the two new carpets. Changed: the name of the new carpet to "blackred" so it would avoid confusion with the original carpet.
2018-12-07 22:48:46 -06:00
Redtail
e339bcd2ca
Added a new carpet
...
Worked on adding a new carpet. It isn't -finished- yet and Trilby is going to help look over what I've done so I can make this work.
2018-12-01 20:21:18 -06:00
deathride58
0ce450eab8
tgstation/tgstation#40662 - Stops using the rad insulation component to provide default rad insulation features in order to save a bit of memory
2018-10-02 19:36:21 -04:00
Poojawa
720b25c6f5
floor fixes and gun memes
2018-09-22 03:50:37 -05:00
Poojawa
d231018a3a
Flashy flash and Gondola Pods
...
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
Poojawa
bc0d14c193
Continual updates until merged
2018-09-17 04:55:03 -05:00