shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,122 Commits 5 Branches 0 Tags
aace7379893828e201e434696d9ea4cdaff33bf7
Commit Graph

20610 Commits

Author SHA1 Message Date
Jerry Wester
aace737989 Revert "Grant Arachnid Abilities to Driders" 2022-10-19 17:20:52 -06:00
silicons
afed04d2fa Merge pull request #15873 from zeroisthebiggay/tallears 
tall ears from virgo
 2022-10-19 16:15:11 -07:00
zerothebigboy
1f8f5dc071 cocka 2022-10-19 03:49:33 -04:00
silicons
2ec0e810fc Merge pull request #15869 from JerryWester/feat/drider-webs 
Grant Arachnid Abilities to Driders
 2022-10-18 21:17:03 -07:00
zerothebigboy
2fd981a05a penis 2022-10-18 23:57:02 -04:00
zerothebigboy
30bf2312f3 seizure 2022-10-18 23:37:40 -04:00
deathride58
2d5f5d6c52 Merge pull request #15833 from Hatterhat/cluwne-drop 
drops floor cluwnes (random event max occurrences 0)
 2022-10-16 13:09:21 -04:00
deathride58
ba8af5114e Merge pull request #15861 from shellspeed1/random-whiteship 
Ports random whiteships from tg
 2022-10-16 13:07:07 -04:00
deathride58
fcb90142b3 Merge pull request #15818 from Putnam3145/quark-nerf-2-nerf-harder 
Let's just hard cap QCD research output (per burst)
 2022-10-16 12:38:41 -04:00
deathride58
1c36a35d63 Merge pull request #15840 from Putnam3145/hard-cap-smatter-output 
Hard caps supermatter gas output
 2022-10-16 12:34:37 -04:00
silicons
f7937e54e0 Merge pull request #15860 from shellspeed1/public-bounties 
Port of public bounties and the sales tagger from tg.
 2022-10-12 03:27:37 -07:00
silicons
52d91c6d8e Merge pull request #15870 from Hatterhat/organ-recursiorgan 
shoving severed bodyparts (e.g. heads) in smartfridges imparts organ freezing
 2022-10-12 03:27:15 -07:00
Hatterhat
35b8108edb brain freeze head cheese 2022-10-10 21:44:25 -05:00
shellspeed1
5fc34292c0 fixes resting 2022-10-09 15:45:51 -07:00
silicons
d91100c0f2 Merge pull request #15867 from Hatterhat/fists 
[READY FOR REVIEW] [FRAMEWORK] kinetic brawling - the kinetic gauntlets rework nobody asked for
 2022-10-08 19:57:37 -07:00
silicons
e4d687da0c Merge pull request #15857 from shellspeed1/premium-kas-for-borgs 
Readds the premium ka for borgs
 2022-10-08 15:39:19 -07:00
Jerry Wester
1015987d12 driderman, driderman, does whatever a spider can 2022-10-06 23:38:16 -06:00
Dan-Neposh
a447d337a8 misc balance changes 2022-10-06 00:22:51 -04:00
Hatterhat
282cc819dc works on my machine 2022-10-04 20:10:09 -05:00
Hatterhat
38bd037b66 box that mf up 2022-10-04 14:14:04 -05:00
silicons
93e8a69c4c Revert "Updates auxmos to 2.0.0" 2022-09-28 01:05:10 -07:00
shellspeed1
142c07c51d Merge branch 'master' into premium-kas-for-borgs 2022-09-23 17:00:02 -07:00
silicons
a8ef986ce5 Merge pull request #15848 from shellspeed1/full-auto-port-from-tg-Credit-to-Fikou 
Port of a bunch of stuff to update guns at this point because we have a bunch of stuff we are missing.
 2022-09-23 16:27:03 -07:00
silicons
b0703d1bd9 Merge pull request #15854 from shellspeed1/borg-radio-improvements 
Ports Adding radio access to borgs by default from splurt. Credit to NopemanMcHalt for the splurt port and Ayfa212 for the initial work.
 2022-09-23 16:26:54 -07:00
silicons
96384ac667 Merge pull request #15856 from shellspeed1/borg-mining-ID-fix-and-premium-KA-return 
Fixes the mining borg point card
 2022-09-23 16:24:36 -07:00
silicons
fbf7a2de90 Merge pull request #15853 from shellspeed1/posialert-console 
Port of the Posialert console from hyper. Credit to jjpark-kb for initial work.
 2022-09-23 16:21:19 -07:00
silicons
ef38bc5522 Merge pull request #15858 from Putnam3145/auxmos-2 
Updates auxmos to 2.0.0
 2022-09-23 16:20:31 -07:00
silicons
a1fc1e0377 Merge pull request #15855 from shellspeed1/borg-pda-addition 
Ports borg pdas from hyper. Credit to haha26315 for the orginal PR and BongaTheProto for their port to splurt.
 2022-09-23 16:16:03 -07:00
shellspeed1
dfddbc23c3 ports https://github.com/tgstation/tgstation/pull/53603 Credit to TiviPlus 2022-09-22 01:10:08 -07:00
Putnam3145
1ac44f22c8 i am wont to make the worst mistakes 2022-09-21 17:55:34 -07:00
Putnam3145
223307aaa8 i need to reimplement this joy 2022-09-21 17:43:37 -07:00
shellspeed1
17f513eae4 Fixes clicking in the object menu but at what cost 2022-09-20 23:08:24 -07:00
shellspeed1
de4d468472 lets not have bounty cubes worth a bunch more than they should be. port of https://github.com/tgstation/tgstation/pull/56914 Credit to cacogen. 2022-09-20 20:55:38 -07:00
shellspeed1
a55b2c4ff3 ports https://github.com/tgstation/tgstation/pull/56375. Credit to cacogen. 2022-09-20 20:05:59 -07:00
shellspeed1
44536ad7ab Fixes a runtime which bricked the pad plus fixing sprites. Also ports https://github.com/tgstation/tgstation/pull/55533 credit to cacogen. 2022-09-20 16:57:49 -07:00
shellspeed1
40dc7d57c3 port of https://github.com/tgstation/tgstation/pull/55762, credit to ArcaneMusic. 2022-09-18 22:40:07 -07:00
shellspeed1
aa7252ffd6 port of 418c58a9c3 to make pad deconstructible. 2022-09-18 22:13:44 -07:00
shellspeed1
cdb1fbb1e2 port of https://github.com/tgstation/tgstation/pull/54029/files# Aka this is where we get bounty cubes and remove the public bounty console. Credit to ArcaneMusic. 2022-09-18 21:55:10 -07:00
shellspeed1
b4f886d999 port of https://github.com/tgstation/tgstation/pull/49111 aka sales taggers, credit to ArcaneMusic 2022-09-18 20:55:22 -07:00
Putnam3145
eb6a86f37f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxmos-2 2022-09-18 16:41:24 -07:00
Putnam3145
fa9bbfaedf Revert "Update auxmos to 2.0.0" (#15859) 2022-09-18 16:40:45 -07:00
Putnam3145
d95f5729cc wow i forgot some extremely important updates haha 2022-09-18 16:27:48 -07:00
Lin
a0bc2c1e09 Merge pull request #15826 from Putnam3145/auxmos-2 
Update auxmos to 2.0.0
 2022-09-18 05:44:58 +00:00
shellspeed1
3dace329be adds public bounty consoles without inflation, also removes the mint 2022-09-17 19:27:40 -07:00
shellspeed1
2d90e0ab33 readds the premium ka but for borgs 2022-09-17 19:03:03 -07:00
Lin
07484bb09f Merge pull request #15850 from Putnam3145/bastion-bourbon-shitcode 
fixes the worst use of a for loop ever
 2022-09-17 23:13:41 +00:00
shellspeed1
b8f7bb00c9 Fixes encoded langauge so people can speak it, also redoes xeno tongue so it can speak same langauges as rest of crew. (#15845) 2022-09-17 13:44:29 -07:00
shellspeed1
d83747dc74 Ports Quantum Spin Inverter from TG. (#15846) 
* ports bluespace swapper

* fixes materials so we can print quantum spin inverters

* its diamond not diamoond
 2022-09-17 13:39:32 -07:00
shellspeed1
a3c01b96f3 Update xeno.dm (#15837) 2022-09-17 13:37:55 -07:00
shellspeed1
d9e15776ee Ports the RBMK reactor from both NSV using Hyper and Splurt code (WIP) (#15847) 
* sprites and sounds

* The code for the reactor itself

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Map stuff

* Removes Clamps.

* Matrices separated, this was a mistake on my part.

* Update tgstation.dme

* removal as per putnam's review

* redfines highest available as 1007

* possible soundloop fix? probably not.

* temporary config thing to make engine load

* changes to map template from splurt

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* actually somehow fixed the runtimes?

* old maps from hyper, not needed..

* Revert "old maps from hyper, not needed.."

This reverts commit 92ccd89952d360206926d8b57e82084994a6a0d6.

* take two on removal

* fixes power output

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* deals with the double turf

* Revert "temporary config thing to make engine load"

This reverts commit 7f52188d5261cd60024ef36cf7c33df0748d0c79.

* was told to bring it back

* don't need to change these

* next time I'll just copy paste it instead of type it.

* a

* Flexi Seal crate so we can fix the reactor

* set power to 0 so it can be fixed

* nerfs power output

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
 2022-09-17 13:33:51 -07:00