shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,712 Commits 5 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

142 Commits

Author SHA1 Message Date
Seris02
6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
Artur
e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
Seris02
18489e5b65 merge fixes 2020-02-02 11:51:26 +08:00
Artur
bb8eed7ae6 Initial Commit 2020-01-31 13:41:49 +01:00
Artur
255f2ce449 Testmerge Conflict fix? 2020-01-22 20:17:42 +01:00
Seris02
47d1f46172 fixes and stuff 2020-01-19 15:53:32 +08:00
Seris02
04b34ec8ed hijack implant 2020-01-18 18:04:31 +08:00
Putnam
6d4f400f5c updated the tgui file for the conflict 2020-01-17 21:34:41 -08:00
keronshb
4dc85dd4ef the compile file for this 2020-01-16 16:28:11 -05:00
keronshb
69b5164103 Merge branch 'master' into RemoteMoodResearch 2020-01-16 15:50:11 -05:00
Artur
6e4829e971 Really works properly now 2020-01-16 11:33:05 +02:00
Artur
2208aa0f09 citadelification 2020-01-15 09:49:18 +02:00
Artur
8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
keronshb
35cd77d433 Adds the nanite remote for some programs 
Adds a new remote function from tg
 2020-01-06 20:28:33 -05:00
kevinz000
aac1b42b8f nightshift improvements 2020-01-03 00:01:48 -08:00
Ghommie
4502d7b795 Ports improved and simplier fire alarms. 2019-12-12 22:44:20 +01:00
Ghommie
8615c0ea8f Merge branch 'Ghommie-cit394' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit394 2019-12-03 02:32:59 +01:00
Putnam
1b310d41bf Filters are now volume-based. 2019-11-29 21:23:08 -08:00
Ghommie
d3bce1bbcd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2019-11-27 02:59:08 +01:00
Ghommie
4e05c27cdb Updating supply pods code. 2019-11-27 01:54:10 +01:00
Fermi
a4d61f8571 Okay last tweak I'm seriously gonna stop 2019-11-20 21:44:02 +00:00
Fermi
bfb5f75016 Finishing up final UI adjustments 2019-11-20 21:23:54 +00:00
Fermi
b523f241fd Slighty better but UGH why don't you sit on the right like I want. 2019-11-20 18:20:36 +00:00
Thalpy
32a1c67171 Makes purge function without a body. 2019-11-20 15:14:07 +00:00
Fermi
f14cc4acdb OOps too fast 2019-11-20 12:12:08 +00:00
Fermi
48e1c64c8d Final 2019-11-20 11:35:40 +00:00
Thalpy
20fa223fc4 Oop 2019-11-19 16:46:59 +00:00
Thalpy
3abae989df Final settings 2019-11-19 16:44:10 +00:00
Thalpy
c0287cf7b5 Reagent sleepers! 2019-11-19 14:50:22 +00:00
Thalpy
d3006bed32 Spelling 2019-10-15 14:25:08 +01:00
Thalpy
597160ca15 Fixed werid stuff. 2019-10-15 14:17:36 +01:00
Thalpy
e71a70f406 Adds medolier + bag antics 2019-10-15 11:40:07 +01:00
Ghommie
277f031143 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147 2019-09-20 02:27:39 +02:00
Fermi
409cbe876a Okay ACTUALLY does what I want it to. 2019-09-11 18:46:32 +01:00
Ghommie
9ec97579bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147 2019-09-03 21:08:09 +02:00
Fermi
10b2cec485 Adds a analyse function for advanced chems 2019-08-07 16:52:58 +01:00
Fermi
87b412a8c4 Recompiling gui stuff. 2019-07-28 23:38:10 +01:00
Ghommie
b818b1eedd Updating spraycans and crayons code. 2019-07-17 15:45:48 +02:00
Thalpy
f77bcc9765 Merge branch 'master' into master 2019-07-14 15:10:32 +01:00
Ghommie
d36bae06a7 Ports the Chem Master choose your pill PR plus post-improvements 2019-07-12 07:39:17 +02:00
Thalpy
937d6467e6 Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_ 2019-06-30 19:16:27 +01:00
Thalpy
e09f189895 WELCOME TO PH'S HELL RIDE 2019-06-30 01:56:10 +01:00
Carlen White
ccef9c326a Sleepers now show blood level and type for occupants. 
https://i.imgur.com/RaMjgt2.png

https://i.imgur.com/qkaBggM.png

Also updated TGUI package.json.

_This has been properly resigned with the correct key._
 2019-05-20 17:55:25 -04:00
Poojawa
e5a96114ca Fixes exploit and a tgui issue with Hypo vials 2018-09-24 00:38:15 -05:00
Poojawa
d231018a3a Flashy flash and Gondola Pods 
and cult effect addition, fixes CTF
 2018-09-21 02:48:17 -05:00
Poojawa
9b376dac92 Adds a fuckload of tool updates 
also updates tgui
 2018-09-05 06:38:33 -05:00
kevinz000
b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
deathride58
f1739cb482 Upstream fix mirror spree (#7362) 
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable

* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms

* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink

* tgstation/tgstation#38988 - Fixes blob victory.

* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button

needs tgui recompile

* tgstation/tgstation#38994 - Fix timer bug

* TGUI recompile

* tgstation/tgstation#39035 - Fixes navigation computers.

* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime

* tgstation/tgstation#39044 - Fixes burgers icons

* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations

* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero

* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo

* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
 2018-07-20 03:40:39 -07:00
Dax Dupont
899d1e2d73 Cleans up the chem synths jesus christ what the fuck 2018-06-16 15:38:22 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00