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

20573 Commits

Author SHA1 Message Date
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
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
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
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
shellspeed1
1ebc2e584b makes weapons unsafe 2022-09-17 06:53:46 -07:00
shellspeed1
15006a5dfd Revert "adds gun safeties, remember to turn them off." 
This reverts commit 9ca985b769.
 2022-09-17 06:47:26 -07:00
shellspeed1
c886e2fd24 forgot this 2022-09-17 06:38:19 -07:00
shellspeed1
22d22447d2 removes the premium KA 2022-09-17 06:36:49 -07:00
shellspeed1
d7a2f14298 fixes and ka 2022-09-17 03:46:24 -07:00
shellspeed1
11ec2b89e0 borg pda 2022-09-17 02:40:37 -07:00
shellspeed1
8d9804e953 adds radio access to borgs by default 2022-09-17 02:20:36 -07:00
shellspeed1
527b85e4a4 woopsie 2022-09-17 02:00:47 -07:00
shellspeed1
59ef5bbcf1 port of the positronic alert console 2022-09-17 01:55:55 -07:00
shellspeed1
64ce476764 removes admin messaging 2022-09-16 19:28:56 -07:00
shellspeed1
9ca985b769 adds gun safeties, remember to turn them off. 2022-09-16 19:24:21 -07:00
shellspeed1
29d16e5f30 fixes weapon safety and fire selector button. 2022-09-16 19:24:06 -07:00
shellspeed1
91c095989a stuff 2022-09-16 17:55:10 -07:00
Putnam3145
e1cfa92080 fixes the worst use of a for loop ever 2022-09-13 23:19:12 -07:00
Timothy Teakettle
3de3dc8e6f lets ghosts click a pAI device to download into it without a master (#15838) 
* yes

* Update pai.dm
 2022-09-13 12:41:36 -07:00
shellspeed1
bc13bdb177 sort of working fire selector, still need to get the safety stuff figured out and finish getting the selector working properly 2022-09-09 22:23:05 -07:00
shellspeed1
f2ed6a571c this gets it to the point it compiles 2022-09-09 18:04:52 -07:00
shellspeed1
fbc80cf829 initial port 2022-09-09 00:29:20 -07:00
Putnam3145
617768dd40 Destructive analyzer no longer buy one get 49 free 2022-09-02 15:09:15 -07:00
Lin
c35246d87b Merge pull request #15827 from Putnam3145/singunerf 
Field generators now yell on the radio if they fail while there's a singulo/tesla
 2022-09-01 05:34:36 +00:00
Lin
5676dd6424 Merge pull request #15830 from Putnam3145/sleep-tight-disky 
comfier disks take longer to summon lone ops (they still will though)
 2022-09-01 05:34:22 +00:00
zeroisthebiggay
7aeec9b083 replaces weight machine sprites with TG's and subsequently wipes a portion of the goon file's existence (#15829) 
* basedado

* becnhpress
 2022-08-31 21:38:44 -07:00
silicons
34caa8c75f Merge pull request #15808 from Putnam3145/rep-investment 
Allows setting antags to "low" (if antag rep is on)
 2022-08-31 15:09:27 -07:00
silicons
58d28db69f Merge pull request #15825 from Putnam3145/fix-job-code 
Unfricks job code (oh well)
 2022-08-31 15:07:08 -07:00
Putnam3145
1bb15d2858 Fixes condensation overwriting other condensation 2022-08-30 00:21:05 -07:00
Putnam3145
c5d1a5f590 sleep tight, disky 2022-08-29 21:35:54 -07:00
Putnam3145
0385d27b24 Revert "sleep tight, disky" 
This reverts commit e27502ceb1.
 2022-08-29 21:34:41 -07:00
Putnam3145
e27502ceb1 sleep tight, disky 2022-08-29 21:34:26 -07:00
Putnam3145
0a31d4cf12 Made some events still show messages with intern 2022-08-29 03:06:21 -07:00
Lin
d0eb6db397 Merge pull request #15820 from Putnam3145/shoe-untieing 
Nerf untied shoes event
 2022-08-29 06:16:06 +00:00
Lin
3bb576bea7 Merge pull request #15823 from zeroisthebiggay/paidforinsex 
fixes harpy wings and steals the harpy wings from rp so that there is some variety
 2022-08-29 06:15:57 +00:00
Putnam3145
c87c72bfb8 this needs arguments lol 2022-08-28 16:11:51 -07:00