shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,447 Commits 5 Branches 0 Tags
2e29f30fdf54ca4b0ac0d8ebf77fb5f610457899
Commit Graph

930 Commits

Author SHA1 Message Date
SandPoot
2e29f30fdf Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing 2021-02-18 15:04:22 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Hatterhat
c5a9a8905a actually makes golem gpses start off 2021-02-13 15:20:24 -06:00
TyrianTyrell
4f5f0eec07 Update radio.dm 2021-01-31 14:19:04 -05:00
TyrianTyrell
cfa169293c Update radio.dm 2021-01-31 14:17:53 -05:00
TyrianTyrell
318f34be78 Update headset.dm 2021-01-31 14:15:40 -05:00
silicons
6a2ae34ebe Merge pull request #14111 from Arturlang/revenant_TK 
[READY]Gives the revenant TK
 2021-01-25 23:17:09 -07:00
silicons
efecc1804b Merge pull request #14114 from Hatterhat/fgs 
itt: i dont test my code again - free golem ship GPSes start disabled
 2021-01-25 22:59:09 -07:00
MrJWhit
3e157c3aa8 Update headset.dm 2021-01-22 19:18:28 -05:00
Hatterhat
95db018de8 itt: i dont test my code again 2021-01-20 18:34:57 -06:00
Artur
66979e2364 Merge branch 'master' into revenant_TK 2021-01-20 18:27:11 +02:00
Artur
16e0b85b44 More funshit 2021-01-20 18:23:28 +02:00
Blue Wildrose
80ccc93fd7 Removes breast and penis analysis from medical scanners 2021-01-20 07:32:03 -07:00
silicons
9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
silicons
656691912e Merge pull request #13965 from Xantholne/GoodNightDisky 
Good Night Disky
 2021-01-09 15:39:06 -07:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
DeltaFire
d153d82441 Merge pull request #13931 from shellspeed1/porting-turret 
Ports disposable sentry gun for station engineers as a traitor item from TG
 2021-01-08 02:59:48 +01:00
shellspeed1
926b4ca609 Merge branch 'porting-turret' of https://github.com/shellspeed1/Citadel-Station-13 into porting-turret 2021-01-06 18:48:47 -08:00
shellspeed1
21e81faff5 Update traitordevices.dm 2021-01-06 18:48:02 -08:00
shellspeed1
b5e8d3308c Update traitordevices.dm 2021-01-06 18:40:49 -08:00
shellspeed1
67364f4254 Update traitordevices.dm 2021-01-06 18:26:07 -08:00
Xantholne
18a336cec5 Adds bed tucking element 2021-01-05 02:47:21 -07:00
YakumoChen
9325daa743 Update powersink.dm 2021-01-01 03:35:54 +00:00
shellspeed1
b69132bede ports https://github.com/tgstation/tgstation/pull/52931 2020-12-31 00:34:44 -08:00
Letter N
abd94d1c03 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-21 21:19:06 +08:00
Letter N
98ff0a080e ImmursionAudio(TM) 2020-12-21 19:47:11 +08:00
Putnam
d47dcc941c Polycircuit sanity checking 2020-12-17 22:54:52 -08:00
silicons
f8d43b7544 Merge pull request #13679 from DeltaFire15/system-corruption 
[TESTMERGE ONLY] System Corruption for robotic species
 2020-11-18 22:54:51 -07:00
Putnam3145
9d300ade35 Merge pull request #13677 from silicons/newlines 
Adds missing EOF newlines
 2020-11-18 17:50:38 -08:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
DeltaFire
5af48a22dd adds a surgery to fix corruption 2020-11-13 02:24:52 +01:00
DeltaFire
c4b0f21fd2 buncha stuff 
All tools now have the surgical tool flag (save for wires since those have force 0 anyways and are only used very rarely in surgery), but yeah, since we got far more species using robot surgeries (0 -> 3), might be good to not have them accidentally beaten up.
Also fixes organs being eaten after inserting them, yay!
 2020-11-04 04:34:56 +01:00
DeltaFire
feed428510 healthscanner support 
Health scanners now show the type of toxin the target is using (Tox / Corruption)
 2020-11-01 05:10:38 +01:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
Timothy Teakettle
385bd57940 reworks family heirlooms, adds heirlooms that can be based off your species (#13444) 
* corgi tracker

* better heirloom system

* typo
 2020-10-10 12:15:39 +02:00
silicons
8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework 
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
 2020-10-01 03:01:18 -07:00
Putnam
e89e7adda4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments 2020-09-21 03:31:35 -07:00
silicons
95ebeac5b6 fix 2020-09-15 17:27:11 -07:00
Putnam
f13af9f72e Made gases only display in analyzers if they have at least 0.005 moles. 2020-09-14 02:37:47 -07:00
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
BlackMajor
1943a2fdd7 Merge pull request #13246 from silicons/anomaly_manufacturing 
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
 2020-09-06 17:53:35 +12:00
Putnam
9da959795c Made the text make sense, again. 2020-08-30 05:42:21 -07:00
Putnam
15b5b77494 Replaced all the references of fusionpower to instability in results. 2020-08-30 03:06:36 -07:00
Putnam
5ba883bfe5 Fixes fusion power text to make sense. 2020-08-30 02:53:46 -07:00
silicons
9250a6d71d Merge pull request #13275 from Chiirno/portable-chem-mixer 
Portable chem mixer
 2020-08-29 21:34:57 -07:00
Letter N
fe17bee28e reverts thing kev said about 2020-08-29 14:36:41 +08:00
Chiirno
2df4bedb06 All the errors deleted away 2020-08-27 14:44:19 -03:00
Chiirno
fdc2cea077 added chem dispenser, time for errors 2020-08-27 14:27:35 -03:00
silicons
bd5766a8be changes 2020-08-23 05:27:53 -07:00
Letter N
3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00