19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
98703e6ad6
Merge remote-tracking branch 'upstream/master' into arcade-carpets
2020-10-01 13:41:10 -05:00
643421bc23
adds arcade carpets
...
yay
2020-09-28 14:43:03 -05:00
b97b595f6f
Three new wooden floor types
2020-09-26 18:29:46 -04:00
febd4a47c1
I can probably afford to have these higher, really.
2020-09-04 08:23:53 -07:00
d6ee54c77d
Makes superconducting work for the first time ever.
2020-09-04 08:22:54 -07:00
120bcfc00c
Merge pull request #13178 from lolman360/plumb
...
[READY] ports plumbing (no more waiting for tgui4)
2020-08-20 21:32:26 -07:00
f611945b34
Merge pull request #13180 from Detective-Google/glass-floors
...
ports multiz glass floors (tgstation/tgstation#50831 )
2020-08-17 03:14:15 -07:00
8dedcbcf76
Merge branch '13113'
2020-08-16 18:53:35 -07:00
83e72b4f96
Merge branch '13164'
2020-08-16 18:51:36 -07:00
d287f44d9a
Merge pull request #13045 from silicons/coggers
...
ports bronze (fake clockwork) airlocks and windows
2020-08-16 20:20:03 -05:00
44e024a62f
specification
2020-08-16 18:44:05 -05:00
0e1586f24d
adds a construction path to glass floors
2020-08-16 18:21:29 -05:00
f41c412cb9
material -> mineral
2020-08-14 23:41:29 -05:00
76bfd9b3a6
?
2020-08-14 16:09:49 -05:00
81f7307575
yeah
2020-08-14 15:38:27 -05:00
eb8574d6d6
heretics from tg (with changes)
2020-08-10 19:17:26 -07:00
6c57dce54e
WX
2020-08-09 23:52:21 +10:00
308d77da7c
Merge branch 'master' into plumb
2020-08-09 22:48:18 +10:00
13c9954f74
fix
2020-08-07 17:00:27 -07:00
815ddd1866
oh boy
2020-08-05 21:34:26 -07:00
17d1fd0692
fixes
2020-07-22 12:42:46 +10:00
526d257410
fix
2020-07-20 11:48:08 -07:00
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
b280c0f550
Merge pull request #12622 from timothyteakettle/grammar-fixes
...
big batch of spelling/grammar corrections
2020-06-29 21:13:06 +02:00
76b5557e1e
bunch of grammar corrections
2020-06-27 02:12:44 +01:00
c5cbfa64e5
Porting further material datum features and improvements.
2020-06-24 20:45:17 +02:00
6db076c42f
Lowers the slowdown on snow tiles ( #12404 )
...
* Update fancy_floor.dm
* Update fancy_floor.dm
2020-06-04 15:52:30 -07:00
f572fe4607
Revert "Framework for (hopefully) reducing memory usage by replacing thousands of decals with turfs that look visually identical ( #12383 )" ( #12387 )
...
This reverts commit ab86d669a7
2020-05-30 14:06:38 -07:00
ab86d669a7
Framework for (hopefully) reducing memory usage by replacing thousands of decals with turfs that look visually identical ( #12383 )
...
* yeah don't worry trilby I have the 'sprites'
* conflict
2020-05-28 23:30:34 -07:00
2857a13933
nested ( #12381 )
2020-05-28 14:12:58 +02:00
85186a9714
Porting updates related to material datums. ( #12317 )
...
* Porting updates related to material datums.
* art_type
* oh oh
2020-05-25 14:21:00 -07:00
806966cd75
fixes the second level not spawning any rocks (and therefore no glass) while I have a PR open
2020-05-09 17:51:45 -05:00
bd37d45334
Ports TG Icemoon framework and map ( #49680 ) ( #12002 )
...
* ports all the tg junk for icemoon, not yet changed to make it all compile
* fixes
* fixes
* fixes
* fixes
* fixes
* new stuff
* whew
* fixes
* it compiles, now to fix the maps
* fixes the maps
* fixes solars + removes the space tiles in the toxins burn chamber
* nukes the SpawnTerrain proc used for tg geysers
* linter fix
* fix
* fixes the non matching turf atmos (hopefully)
* more mapping fixes
* dmm2tgm
* unfucks changeturf for the more_caves
* fixes the volanic subtypes of the other thing
* fixes the stupid fucking tile placing list
* some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life
* fixes a bunch of mismatch atmos in ruins
* fixes wendigo cave having no air
* backwards couch backwards couch
* fixes the SM up
* wendigos can't runtime when butchering if you can't butcher them 😎
* makes the wendigo fight have the same atmos as the surrounding icemoon
* Tweaks atmos mixture from o2=22;n2=82;TEMP=180 to o2=18;n2=63;TEMP=180, making lavaland weapons actually work
* makes the wendigo screech shake not completely aids
* fixes snowlegion portals dropping proper legions instead of skeles
* brings the engioutpost ruin over as well
* whoopps
* empty commit to reroll bots
* Fixes pirates, ops, the mining base, and gives pirates and ops drills
* fixes lone ops and ninjas
* fixes the snowed plating getting fucked when tiles are placed on it
* removes some OP junk from the wabbajack pool (aka removes non-antag headslugs again)
* more bug fixes
* empty commit to reroll bots
* hopefully finally kills the active turfs on the library ruin
Co-authored-by: kevinz000 <2003111+kevinz000@users.noreply.github.com >
2020-05-07 14:46:16 +02:00
adeb61180c
big floof
2020-04-06 01:09:25 +01:00
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
c14439494a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
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
686a76dd1d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-04 13:35:05 +01:00
f7b91f9b65
Merge pull request #10238 from Ghommie/Ghommie-cit478
...
Brings in some mapping code updates.
2020-01-03 00:01:54 +00:00
60134ea8ae
[s] Fixes singularity pulls duping rods out of engine floors.
2019-12-25 03:34:42 +01:00
12aa266efe
Missed this one too.
2019-12-19 12:27:30 +01:00
8566e2396d
Brings in some mapping code updates.
2019-12-19 00:44:14 +01:00
5bf252a58c
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
2019-12-17 01:57:56 +01:00
542c9007ee
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-12-06 20:09:35 +01:00
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
b9ce4a8622
Oopsie
2019-12-05 01:49:55 +01:00
950b884da5
Adds colored fairygrass.
2019-12-05 01:47:42 +01:00
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
silicons