Commit Graph

99 Commits

Author SHA1 Message Date
Detective Google
7df8011c5a fixes the white tthing 2020-10-01 13:52:32 -05:00
Detective Google
98703e6ad6 Merge remote-tracking branch 'upstream/master' into arcade-carpets 2020-10-01 13:41:10 -05:00
Detective Google
643421bc23 adds arcade carpets
yay
2020-09-28 14:43:03 -05:00
ItzGabby
b97b595f6f Three new wooden floor types 2020-09-26 18:29:46 -04:00
lolman360
20cd9f0862 Update shuttle.dmi 2020-08-29 21:28:20 +10:00
silicons
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
Detective Google
016fd2ac3c woo yeah yeah woo 2020-08-15 23:55:52 -05:00
kiwedespars
eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
Detective Google
6f67be1aca sexy walls :crabrave: 2020-07-01 15:43:23 -05:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Ghommie
162549a3c2 Fixing stuff. 2020-06-19 20:34:51 +02:00
Ghom
1c3bfa623f Merge pull request #12175 from Detective-Google/snaxi2
Adds a New map, Snow Taxi (A vgstation13 map port)
2020-06-02 23:48:50 +02:00
Ghom
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
KathrinBailey
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
Ghom
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
Detective Google
bfde367c4e Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-11 20:56:42 -05:00
KathrinBailey
9816b270ec Padded Floor & Chess Pieces
Sprites improved. A black 50 alpha border was added to the chess pieces. The king pieces were shortened by 1 pixel to let the black border wrap around. This helps the white pieces stand out on bright tiles.

Padded floor now has the centre cushion bit on all corners. This design is similar to other tiles in SS13, so this should hopefully make the sprite fit into a TG codebase more.
2020-05-09 04:55:28 +01:00
Detective-Google
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
Detective Google
071735c5fd these weren't checked, QUIRKY 2020-05-03 20:04:40 -05:00
Detective Google
231fd0edea fixes the stupid fucking tile placing list 2020-04-30 23:04:35 -05:00
Detective Google
71be8ed2fc ports all the tg junk for icemoon, not yet changed to make it all compile 2020-04-24 00:02:03 -05:00
Ghommie
ab3ed7f9c2 Space Hermit Ruin fixes. 2020-04-11 23:27:19 +02:00
KathrinBailey
adeb61180c big floof 2020-04-06 01:09:25 +01:00
ancientpower
56ba8ef127 requested changes 2020-03-01 12:45:00 -06:00
Persi
4c21d71301 Okay, now this should fix it? 2020-02-23 02:34:29 -05:00
Persi
4af2eee9dd Haha, okay... this will break Kilo
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ohHeyKilo
2020-02-23 02:28:18 -05:00
Persi
501019ef75 idk what else to do at this point... 2020-02-23 02:24:27 -05:00
Persi
1dbf2023e7 Maybe I should remember to rename the areas after pasting them in 2020-02-23 02:19:46 -05:00
Persi
f15540c473 Should fix the merge conflict from the pool having its own area 2020-02-23 01:56:31 -05:00
Persi
c4b4a90bd8 Oh hey it's KiloStation
Trying to make Kilo open...

Finally, the work begins!

Kilo added!

Kilo Station!
2020-02-20 00:58:54 -05:00
kevinz000
dbf69e80db area pool 2020-01-25 19:36:13 -07:00
kevinz000
dc3e5e24fd Merge remote-tracking branch 'citadel/master' into the-p-o-o-l 2020-01-25 19:36:06 -07:00
Detective Google
d5b227a0ca adds the POOL to box station
F in chat for dorms 7.
2020-01-11 23:34:07 -06:00
Ghommie
19a3aca619 I fear for my powernet 2019-12-10 15:33:15 +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
Useroth
950b884da5 Adds colored fairygrass. 2019-12-05 01:47:42 +01:00
Useroth
2ced7db508 Ported a bunch of tg hydroponic stuff. 2019-11-21 10:53:57 +01:00
kevinz000
ca99a8285c Merge pull request #9803 from Ghommie/Ghommie-cit350
Ports Improved beach away mission and some fluff mapping items.
2019-11-14 16:36:19 -07:00
kevinz000
bd650e53da Merge pull request #9795 from Ghommie/Ghommie-cit346
Unmodularize areas.
2019-11-14 16:24:36 -07:00
Ghommie
aa441fba5d Ports Improved beach away mission. 2019-11-13 22:52:39 +01:00
Ghommie
f55a602319 Unmodularize areas. 2019-11-13 06:13:18 +01:00
Ghommie
42d9e3cf51 Porting Robustin's Syndicate Infiltrator PR 2019-11-11 18:49:18 +01:00
kevinz000
9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54
ports in the Hilbert's Hotel.
2019-10-24 19:07:33 -07:00
Ghommie
31a6979c3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-10-06 21:54:15 +02:00
Poojawa
6d9aa8de70 More carpet options and ways to get them 2019-10-03 22:54:10 -05:00
Dap
9f275ebf01 Ports trim decals
## About The Pull Request

So smooth, so helpful. These decals can be used to point newer players to departments, or as trim to border departments.

## Changelog
🆑
add: Trim lines!
/🆑
2019-09-08 10:51:05 -06:00
Ghommie
ba3a2c00bb ports in the Hilbert's Hotel. 2019-06-16 10:50:59 +02:00
kevinz000
1034a6ad0e ball stuff 2018-12-16 03:41:37 -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