shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,790 Commits 5 Branches 0 Tags
657a4831b48e4ffe69a96e351bbc27aaebd9bdce
Commit Graph

738 Commits

Author SHA1 Message Date
kevinz000
c92eaf805a Merge pull request #12153 from Citadel-Station-13/Ghommie-patch-1 
Quick webedit fixing thousand stack_trace reports.
 2020-05-08 23:28:06 -07:00
kevinz000
75bcebde36 Merge pull request #12162 from Citadel-Station-13/Ghommie-patch-4 
Quick PR fixing fireman carry.
 2020-05-08 23:27:25 -07:00
Lin
ab8342d453 Merge pull request #12141 from Trilbyspaceclone/patch-367 
Corrects medical packet crafting
 2020-05-08 21:27:43 +00:00
Ghom
2650df11d5 Update riding.dm 2020-05-08 22:12:27 +02:00
Ghom
7616887604 Update mood.dm 2020-05-08 16:13:57 +02:00
Ghommie
835753a02d ! 2020-05-08 02:14:07 +02:00
Ghommie
60bdbfaf61 Merge conflicts, procs instead of macros, mood signals. 2020-05-08 02:12:41 +02:00
Trilbyspaceclone
80687bb17f Update recipes_misc.dm 2020-05-07 18:00:50 -04:00
Ghom
a273fc0fed Merge branch 'master' into Ghommie-cit721 2020-05-07 18:18:54 +02:00
kevinz000
7828c4a5ab Merge pull request #12102 from Ghommie/Ghommie-cit722 
Removing cargo "paperwork" and a few other bloat packs.
 2020-05-07 09:11:45 -07: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
Ghommie
65899bf906 Removing cargo "paperwork" and a few other bloat packs. 2020-05-03 19:56:00 +02:00
Ghommie
76e1ee80b7 Porting "Mobs now turn towards and are shifted based on grab state towards something pulling them" 2020-05-03 07:12:41 +02:00
kevinz000
d4e6fada75 Update mirage_border.dm (#12092) 2020-05-03 03:50:38 +02:00
Lin
f659c036ef Merge pull request #12036 from kevinz000/electrochromatic_windows 
Electrochromatic (dim-on-demand) windows
 2020-05-02 19:13:29 +00:00
Ghommie
42d7d57ad6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit698 2020-05-02 19:17:48 +02:00
kevinz000
269db0c7d6 Identification components + chameleon clothing from uplink is now obfuscated (#12045) 
* fine we'll use components

* syndie kits

* Whew

* examine

* flags

* whew

* compile

* fix

* fix

* ok

* ok

* ok

* done
 2020-05-01 18:39:45 +02:00
kevinz000
1e42f3a3b7 Merge pull request #12023 from Ghommie/Ghommie-cit712 
Fixing riding layers for human/cyborgs.
 2020-04-29 12:03:29 -07:00
TrilbySpaceClone
1191268430 kevs request 2020-04-27 07:34:23 -04:00
kevinz000
28da033111 fine 2020-04-26 17:37:27 -07:00
kevinz000
bf7962d8f9 wow lotsa effort huh 2020-04-26 03:36:09 -07:00
kevinz000
af3651172c wow lotsa effort huh 2020-04-26 03:29:31 -07:00
kevinz000
36512938a0 Merge pull request #11991 from DeltaFire15/nanite-repli-protocols 
Adds nanite replication protocols to our techweb
 2020-04-25 16:54:32 -07:00
kevinz000
4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700 
Movespeed modifiers refactor port.
 2020-04-25 16:51:14 -07:00
Ghommie
d2d5fda0e2 Fixing riding layers for human/cyborgs. 2020-04-25 16:54:17 +02:00
Ghom
7b877eb9e0 Merge pull request #11832 from Seris02/storagewhitelist 
adds extra functionality to storage whitelists
 2020-04-25 02:50:56 +02:00
Ghom
f01cb896e5 Apply suggestions from code review 2020-04-25 02:43:56 +02:00
DeltaFire
1a6f5eb131 If it compiles it works 
Kidding, tested on local and it runs fine.
Adds nanite protocols to the techweb, without BEPIS, aswell as adding one more protocol onto the ones ported from /tg
 2020-04-23 15:15:26 +02:00
kevinz000
529a8e52c7 Merge pull request #11960 from Trilbyspaceclone/patch-352 
Theirs a snake in my boot...
 2020-04-22 18:42:46 -07:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Lin
7f271157c3 Merge pull request #11929 from Ghommie/Ghommie-cit692 
Shielded Component
 2020-04-22 20:33:12 +00:00
Ghommie
63f5e101a2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit700 2020-04-22 22:30:10 +02:00
Ghom
63362f74c9 Merge pull request #11912 from Seris02/betteruipref 
toggle for tetris bags
 2020-04-22 22:26:40 +02:00
Ghommie
63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +02:00
Ghommie
e9bf432a0d Scavenging element. 2020-04-22 03:30:40 +02:00
Ghommie
824904844c Componentized for sanity. 2020-04-21 19:51:44 +02:00
Ghom
5a6a205b9d Merge pull request #11868 from Arturlang/tackling_and_lunge 
Ports TG Tackling and uses it to rework bloodsucker lunge
 2020-04-21 15:50:44 +02:00
Trilbyspaceclone
6dd89ec1e0 Update pockets.dm 2020-04-20 21:50:25 -04:00
Ghom
79eb0f5838 Merge pull request #11956 from Trilbyspaceclone/crafting_menu 
Fixes Crafting menu
 2020-04-21 01:25:46 +02:00
TrilbySpaceClone
c3fc133282 *crys* 2020-04-20 18:28:57 -04:00
TrilbySpaceClone
58cb5e391e *scream* 2020-04-20 18:22:13 -04:00
TrilbySpaceClone
747e27007f ***ahhhh*** 2020-04-20 17:26:22 -04:00
TrilbySpaceClone
4d55f169d5 oh god oh fuck 2020-04-20 17:05:03 -04:00
Timothy Teakettle
c5b8c45bf0 Merge branch 'master' into food-quality 2020-04-20 19:53:39 +01:00
kevinz000
85fcdbf673 Merge pull request #11916 from Trilbyspaceclone/crafting_menu 
Cleans up misc tab in the crafting menu
 2020-04-20 11:37:13 -07:00
kevinz000
cbc9f325f4 Merge pull request #11921 from necromanceranne/minor_fix_scarp_stammod 
Sleeping Carp has a Stamina Mod again, gets Taser resistance, various fixes (no more universal pugilism)
 2020-04-20 11:34:06 -07:00
kevinz000
792af56b67 Update riding.dm 2020-04-19 00:48:51 -07:00
Ghom
f714403d6e Merge pull request #11895 from Seris02/piggybackfix 
fixes piggyback merging
 2020-04-19 04:56:04 +02:00
kevinz000
b65ad491b4 Merge pull request #11902 from Citadel-Station-13/revert-11611-patch-2 
Revert "Makes so turning in place updates riders when riding someone's back"
 2020-04-18 19:32:34 -07:00
necromanceranne
cb39ba3491 Replaces the Scarp stamina mod, adds tased resistance which I forgot to do for almost a month even though I kind of made it with scarp in mind, fixes the capitalization of armwraps 2020-04-19 04:25:41 +10:00