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

658 Commits

Author SHA1 Message Date
Metis be7d332d85 belly 2024-09-14 15:29:13 -04:00
SandPoot dc08550162 push 2024-08-25 04:38:03 -03:00
SandPoot ca8ce67cd6 mail 2024-04-10 20:54:04 -03:00
deathride58 c660811fe8 Merge pull request #16027 from DeltaFire15/modsuit-updates 
Some modsuit updates
 2024-01-01 21:08:56 -05:00
SandPoot 27bdd4b732 aiModule > ai_module 2023-12-17 23:20:43 -03:00
DeltaFire a9af463fdf fixes a broken technode icon 2023-11-13 14:03:46 +01:00
KrissKr0ss 66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits" 
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
 2023-05-01 00:16:20 -05:00
SandPoot 2bf781580e Merge branch 'master' into new-decal-painter 2023-02-15 20:06:29 -03:00
SandPoot 44913d5fff Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter 2023-01-28 01:20:26 -03:00
SandPoot c60f36a42b files 2023-01-28 01:10:49 -03:00
President of Shit PRS d063144713 Re-Adding Bounty Consoles 
Civilian bounties are great, don't get me wrong. But they're civilian bounties and it feels like cargo lost their thing to do, namely putting annoying sheets of paper everywhere. Plus checklists make the brain go ding when you work through them arooga.
 2023-01-14 02:01:12 +00:00
Jerry Wester ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
silicons 23327fa268 Merge pull request #15894 from JerryWester/modsuits 
MODsuits
 2023-01-07 14:07:28 -08:00
Lin 1401959cc9 Merge pull request #15911 from Hatterhat/prescription 
prescription kits, aka the eyewear accessibility update
 2023-01-01 22:52:21 -07:00
Hatterhat ab827ff8dc accessibility or some shit ig 2022-12-26 03:45:26 -06:00
Darius d3e018720c Port the Bluespace Light Replacer 
- Ports the Bluespace Light Replacer from TG
-- Added to Applied Bluespace Research instead of Advanced Sanitation Technology
- Makes the basic Light Replacer a default tech node
 2022-12-24 15:57:11 -05:00
Jerry Wester f083852b6f all modules available from mechfab 2022-12-20 02:03:57 -07:00
Jerry Wester d3c72669d9 clean up & remove longfall boots 2022-12-20 02:03:45 -07:00
Jerry Wester 642d24e8e1 tether module 2022-12-17 16:54:20 -07:00
Jerry Wester 483fe09260 add jetpacks to techweb 2022-12-17 16:54:12 -07:00
Jerry Wester ec78e51760 remove piercing injector, doesn't work properly 2022-12-13 19:15:19 -07:00
Jerry Wester 94bfa88ed9 add more platings 2022-12-13 19:14:43 -07:00
Jerry Wester f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07: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 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
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
shellspeed1 3dace329be adds public bounty consoles without inflation, also removes the mint 2022-09-17 19:27:40 -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 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
Lin 95416bbedc Merge pull request #15587 from TomGarou/Synth-Brainwashing 
Synth Brainwashing AKA Reprogramming
 2022-05-12 20:29:04 +00:00
Lin dec7751f95 Merge pull request #15612 from SandPoot/status_displays 
Syncs status displays to tg's version
 2022-05-12 20:11:54 +00:00
SandPoot 90eab441aa Upload files 2022-05-09 18:50:17 -03:00
silicons 13f326c939 Merge branch 'master' into Synth-Brainwashing 2022-04-15 17:44:30 -07:00
SandPoot 5d4bae4482 Update files 2022-04-10 23:27:12 -03:00
silicons dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles 
/obj/mecha ➡ /obj/vehicle/sealed/mecha
 2022-04-08 18:26:47 -07:00
TomGarou 59874f6553 Synth Brainwashing 
Adds synthetic brainwashing to Citadel-Station-13
 2022-04-08 01:26:07 -04:00
silicons c8cab13081 Merge pull request #15565 from SandPoot/custom-statues 
Custom statues and sculpting changes.
 2022-04-06 12:12:24 -07:00
BlueWildrose 3687361ba5 Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) (#15304) 
* Butts

* testicle fix + hidden is back

* updated booba

* prob bad idea actually thinking about icon states

* fuck

* this should be everything now

* SandPoot's suggestion

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

* tguify that last option

* Revert "tguify that last option"

This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.

* Revert "Merge branch 'master' into cursingcitadel"

This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.

* Revert "Revert "Merge branch 'master' into cursingcitadel""

This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2022-03-30 20:06:00 -07:00
SandPoot 16fddbb140 Upload files 2022-03-18 18:35:29 -03:00
SandPoot a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Artur fc6f3cdffc tested and done, seems to work 2022-02-11 16:54:05 +02:00
Artur 345c1616f2 Adds a way to build bodies using the limbgrower 2022-02-10 18:49:24 +02:00
DeltaFire 074fe5b417 a bunch of stuff 
5° min temp adjustment for active cooling
150% max total cooling efficiency as opposed to 100%
passive heating cools instead at >100% efficiency (to -30°C min)
EMPs jam cooling system readouts.
Nanogel is now printable, for a decent price though it needs a bit of diamond.
 2022-01-02 19:44:35 +01:00
shellspeed1 76324ed06a Update code/modules/research/designs/medical_designs.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:17:49 -08:00
shellspeed1 71a4b7ba00 Update code/modules/research/designs/medical_designs.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:17:39 -08:00
shellspeed1 026ce5dec4 tiny bit more polish, some number tweaks, and research. 2021-10-31 04:18:15 -07:00
silicons 679189cb3d Merge pull request #15277 from Hatterhat/autoloom 
i've been sitting on this a while but here have the AUTOLOOM
 2021-10-27 05:13:40 -07:00
Hatterhat 9c45c41d4f ae 2021-10-16 18:27:59 -05:00