shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,522 Commits 5 Branches 0 Tags
d3a042deaa95e9d3b8fdbde296e4ba316abc5567
Commit Graph
515 Commits
Author SHA1 Message Date
GhomandGitHub ae62566dce Fixing some issues with the now unneeded hack for looms. (#12350) 2020-05-28 00:37:22 -07: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
Artur 9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
GhomandGitHub 3ac61c0704 Porting tg painting code. (#12305) 
* Porting tg painting code.

* yes.
 2020-05-20 18:45:36 -07:00
GhomandGitHub ed90c59d65 Removal of """silk""" (#12221) 
* Removal of """silk"""

* AAA

* Ashwalkers now start with durathread seeds
 2020-05-19 23:43:46 -07:00
Artur dabdf16eac Coonflict fiiixeeess 2020-05-13 12:56:17 +03:00
Artur 5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Ghommie 7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
LinandGitHub ab8342d453 Merge pull request #12141 from Trilbyspaceclone/patch-367 
Corrects medical packet crafting
 2020-05-08 21:27:43 +00:00
Ghommie 60bdbfaf61 Merge conflicts, procs instead of macros, mood signals. 2020-05-08 02:12:41 +02:00
TrilbyspacecloneandGitHub 86fc39a777 le sigh 2020-05-07 17:55:25 -04: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
Ghommie f770586407 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit723 2020-05-05 05:09:29 +02:00
Ghommie 643ef48f0e Macros, generic skill implementations. 2020-05-05 04:42:34 +02:00
Ghommie a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
Ghommie b383066e57 Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS. 2020-05-02 00:00:49 +02:00
TrilbySpaceClone 5d6da47db7 Merge branch 'master' into medical-witchcraft 2020-04-27 07:25:18 -04:00
Ghommie 94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
Ghommie fecf6cef2f Coin can be inserted in ID cards now. 2020-04-25 14:22:49 +02:00
Artur 120615d472 Ports https://github.com/tgstation/tgstation/pull/44525, and 
And fixes to make stuff work
 2020-04-23 17:36:13 +03:00
Artur a8aa2e2014 Updates modular computers, begins work on shuttle stuff. 2020-04-23 15:06:35 +03:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
TrilbyspacecloneandGitHub 71e91a15b1 toxin healing bad I guess 2020-04-22 02:19:35 -04:00
TrilbySpaceClone 37a0fb558c with fixes and new gauze 2020-04-19 15:29:48 -04:00
Ghommie 3dab97b62f I set amount instead of max_amount to INFINITY, that's why it hanged. 2020-04-17 21:52:08 +02:00
Ghommie 4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Artur f910a0fd32 Conflict fixes 2020-04-14 09:27:54 +03:00
kevinz000andGitHub d60932ca5d Merge pull request #11697 from Ghommie/Ghommie-cit655 
Ports "Obliterates item_color: new washing machine functionality edition"
 2020-04-12 16:16:37 -07:00
GhomandGitHub a96f6238df Merge pull request #10891 from Trilbyspaceclone/more_crates+bags 
[Ready]Better crate options
 2020-04-12 05:48:20 +02:00
Ghommie 7c1e5aa2c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-09 15:46:19 +02:00
kevinz000andGitHub f60cf32562 Merge pull request #11775 from Trilbyspaceclone/frail-crafting 
Frail crafting - Glass work additions and changes!
 2020-04-09 02:41:01 -07:00
TrilbySpaceClone b350436fbc working 2020-04-07 18:31:23 -04:00
TrilbySpaceClone e9d2e798a3 more glasswork 2020-04-07 17:58:23 -04:00
LinandGitHub 395d33e54c Merge pull request #11766 from Ghommie/Ghommie-cit699 
Bringing back accidentally reverted solar panel fixes.
 2020-04-07 19:59:48 +00:00
Ghommie f6db5764e3 Bringing back accidentally reverted solar panel fixes. 2020-04-06 18:20:34 +02:00
KathrinBailey adeb61180c big floof 2020-04-06 01:09:25 +01:00
Artur 2cf7a1f6ba Merge remote-tracking branch 'origin/master' into Garlic 2020-04-02 20:41:58 +03:00
Ghommie 45d1917f0f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-02 16:07:13 +02:00
Ghommie c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
Ghommie 983d7826b6 Ports "Fixes vault and high security door material exploit and tweaks high security door cost" 2020-03-29 00:51:16 +01:00
Artur fdc6a02eea Hm 2020-03-25 12:46:42 +02:00
TrilbyspacecloneGitHubGhom
 		f8147e5a85 Ports over Mortars and Pestles (#11546) 
* 2 ports for the commit of 1!

ports -[ready]ghetto grinder
#43600
ports - Mortar and Pestle Fixes #48086
Links -
https://github.com/tgstation/tgstation/pull/43600
https://github.com/tgstation/tgstation/pull/48086

* what if we didnt have that...

* Apply suggestions from code review

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-24 14:03:31 +01:00
Ghommie 86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
kevinz000andGitHub 00e0683889 Merge pull request #11501 from Citadel-Station-13/Ghommie-patch-4 
Ports "Makes iron sheets build the normal metal table again"
 2020-03-17 09:29:29 -07:00
kevinz000andGitHub b062c76ca7 Merge pull request #11485 from Ghommie/Ghommie-cit625 
Fixing a little issue with the musician trait etcetera.
 2020-03-16 13:23:25 -07:00
GhomandGitHub c4597bc570 Update sheet_types.dm 2020-03-16 16:59:37 +01:00
Ghommie 5e5bdec85d More runtime errors. 2020-03-16 01:55:02 +01:00
Ghommie 1d51ac5ff2 Fixing some bug reports. 2020-03-14 02:34:25 +01:00
TrilbyspacecloneandGitHub a2baa47600 50 commits of hell 2020-03-12 21:27:12 -04:00