shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,354 Commits 5 Branches 0 Tags
f0bcab1143dbd649be07cb4e1ad659ebccced0d4
Commit Graph
358 Commits
Author SHA1 Message Date
siliconsandGitHub 120bcfc00c Merge pull request #13178 from lolman360/plumb 
[READY] ports plumbing (no more waiting for tgui4)
 2020-08-20 21:32:26 -07:00
siliconsandGitHub 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
silicons 8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
silicons 83e72b4f96 Merge branch '13164' 2020-08-16 18:51:36 -07:00
LinandGitHub d287f44d9a Merge pull request #13045 from silicons/coggers 
ports bronze (fake clockwork) airlocks and windows
 2020-08-16 20:20:03 -05:00
Detective Google 44e024a62f specification 2020-08-16 18:44:05 -05:00
Detective Google 0e1586f24d adds a construction path to glass floors 2020-08-16 18:21:29 -05:00
Detective-GoogleandGitHub f41c412cb9 material -> mineral 2020-08-14 23:41:29 -05:00
Detective-GoogleandGitHub 76bfd9b3a6 ? 2020-08-14 16:09:49 -05:00
Detective Google 81f7307575 yeah 2020-08-14 15:38:27 -05:00
lolman360andGitHub 6f7badda41 Merge branch 'master' into plumb 2020-08-12 09:03:11 +10:00
siliconsandGitHub a8d61b60ef Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch 
adds a cybernetic eyepatch to the syndicate uplink
 2020-08-11 01:47:32 -07:00
kiwedespars eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
lolman360 6c57dce54e WX 2020-08-09 23:52:21 +10:00
lolman360andGitHub 308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
silicons 13c9954f74 fix 2020-08-07 17:00:27 -07:00
silicons 815ddd1866 oh boy 2020-08-05 21:34:26 -07:00
Timothy Teakettle ef53f3faea the old system isnt needed really but sure i guess 2020-08-04 11:43:15 +01:00
Timothy Teakettle 2bbe4631d6 working ricochets 2020-08-03 14:46:24 +01:00
Timothy TeakettleandGitHub 9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
silicons 791bfabc9b walls 2020-07-26 16:03:57 -07:00
silicons 7d7f40ce90 fixes 2020-07-26 14:56:03 -07:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
lolman360 17d1fd0692 fixes 2020-07-22 12:42:46 +10:00
silicons 526d257410 fix 2020-07-20 11:48:08 -07:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons 58e26c540c merge from master 2020-07-20 10:18:44 -07:00
silicons 55f8e37544 sigh 2020-07-18 20:26:11 -07:00
silicons 0b98b0409b sigh 2020-07-18 18:29:09 -07:00
silicons 6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Ghommie 9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
GhomandGitHub b280c0f550 Merge pull request #12622 from timothyteakettle/grammar-fixes 
big batch of spelling/grammar corrections
 2020-06-29 21:13:06 +02:00
timothyteakettle 76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00
Ghommie c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Ghommie de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Detective Google 472ed97b8c port tg#51713 2020-06-22 15:32:23 -05:00
Timothy Teakettle eba1e8f301 fixes the merge conflicts 2020-06-15 23:29:49 +01:00
kevinz000 180b7d31d9 sigh 2020-06-13 09:24:22 -07:00
TrilbyspacecloneandGitHub 6db076c42f Lowers the slowdown on snow tiles (#12404) 
* Update fancy_floor.dm

* Update fancy_floor.dm
 2020-06-04 15:52:30 -07:00
GhomandGitHub 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
Ghommie 1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02:00
KathrinBaileyandGitHub 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
RohesieandGitHub 2857a13933 nested (#12381) 2020-05-28 14:12:58 +02:00
GhomandGitHub 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
GhomandGitHub ab5d65a454 Porting the BEPIS research machinery. (#12277) 
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
 2020-05-24 13:05:15 -07:00
Ghommie a84e7bcecc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-24 04:00:51 +02:00
GhomandGitHub 335f5a37b9 Plane adjustments on several low layer objects. (#12286) 2020-05-17 17:02:57 -07:00
Ghommie 30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Detective Google 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
Detective-GoogleGitHubkevinz000
 		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