shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,769 Commits 5 Branches 0 Tags
bb4e279b72e992eb65f1076c01775cb6aa951570
Commit Graph

107 Commits

Author SHA1 Message Date
kevinz000
591a584785 Merge pull request #9275 from Thalpy/InitialD 
Fixes analyse function on ChemMasters to correctly display purity and fixes the custom transfer for buffer to beaker button.
 2019-09-13 10:43:22 -07:00
Fermi
409cbe876a Okay ACTUALLY does what I want it to. 2019-09-11 18:46:32 +01:00
kevinz000
076b6c8699 Merge pull request #9077 from Sishen1542/id-boingo 
No ID insertion for everything except the hop console
 2019-09-10 22:04:48 -07:00
Sishen
f59b60e83a QOL OOGA BOOGA 2019-08-08 01:11:20 -04:00
Fermi
10b2cec485 Adds a analyse function for advanced chems 2019-08-07 16:52:58 +01:00
Fermi
d080446a77 Merge branch 'pr/20' 2019-07-28 23:28:19 +01:00
Sishen
a1a626ba29 hypovial shit 
iddqd
 2019-07-25 19:11:58 -04: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
deathride58
db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code 2018-07-01 23:54:31 -04: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
oranges
16caaa5f2b Fix RPD icons not showing in IE8 2018-05-20 21:02:13 -05:00
81Denton
8463204549 Runtime: fixes RTG power, adjusts pipenet, adds debug chem dispensers 2018-05-12 18:53:59 -05:00
deathride58
65492ba8ca Update rpd.ract 2018-05-10 23:37:49 -04:00
Tad Hardesty
111ad79eab Use spritesheets to reduce time spent sending PNG assets by 90+% 2018-05-09 22:44:57 -05:00
deathride58
2ee4d3e77d Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326 
[MIRROR] Removes SCP_294
 2018-04-27 09:35:43 +00:00
Armhulen
17aa0acef8 Removes SCP_294 (#37326) 
* aaah sweet essence

* bye bye sprites

* goodbye machine code

* bye bye blacklist entry

* whoops

* scp gone from runtime

* bye bye ract

* bye bye space ruin folder

* bye bye area
 2018-04-25 10:05:57 -05:00
Poojawa
95b78a4a77 misc 2018-04-22 23:46:15 -05:00
Poojawa
b4a7def5ca Hypospray kits and reworks! (#5907) 
* Adds Hypospray kits, fixes reagent overlays

Also adds colors to trek chems other than PINK.

* reee admins.txt

* adds the CMO Hypo MK II kit to the CMO's locker

renames the locker overrides as well, because lazy

* grammer gud

* hypo vial fix suggested by Kfive

* Modifies hypospray functions

* Fixed the Hypospray mk.II, is now comprehensive where it must.

* Fixed bugs, including the vending machine problem.

* Either fixed or didn't fix line terminator issues.

* Turns out there were no line ending problems, rather there were literally spaces after some lines, which got removed automatically.

* Forgot a comma.

* Forgot a comma, even though it's in a comment. Good thing I caught it before somebody tried decommenting it.

* Left a line in the alternative reskin function for hypovials. This has been removed since it's unnecessary.

* delay tweaks. otherwise all good.

* reee github

* unneeded \the I thought were purged

* grammar fix, gives MDs and Chemist hypokits

* Makes chem masters able to produce vials

* recompiles tgui

* Update belt.dm
 2018-03-21 15:28:06 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951) 
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
 2018-03-14 16:49:40 -05:00
CitadelStationBot
544d7bcaf4 [MIRROR] Adds descriptions to all cargo orders! (#5917) 
* Adds descriptions to all cargo orders!

* recompiles tgui
 2018-03-12 07:39:38 -05:00
Poojawa
6b6a08d332 last of the port 2018-03-06 21:51:37 -06:00
RandomMarine
db98a60274 Removes 'release all' buttons from ORM 2018-03-04 15:26:26 -06:00
CitadelStationBot
1437fb4bd4 [MIRROR] Fixes SCP-294 overlay problems (#5746) 
* Fixes SCP-294 overlay problems

* recompiles tgui
 2018-03-02 18:34:45 -06:00
CitadelStationBot
2c5b8a586b [MIRROR] Operating computers now display required surgery chems (#5701) 
* Operating computers now display required surgery chems

* Rebuilds tgui
 2018-02-27 05:05:02 -06:00
Jordan Brown
bc2f2a9728 [READY]Randomized Station Time + Night Shifts 2018-02-21 12:02:28 -06:00
AnturK
35b8e410be html_interface removal and crew monitoring console refactor. 2018-02-15 14:31:27 -06:00
MoreRobustThanYou
73c1088d5a Adds a SCP-294 ruin 2018-02-11 05:13:56 -06:00
CitadelStationBot
330a6ca0af Added transit tubes to the RPD (#5300) 2018-02-05 00:46:34 -06:00
Poojawa
56232d5d60 Maps and misc 2018-01-31 06:20:26 -06:00
yorii
6a485fa8df removes the "and clear buffer" text on eject button 2018-01-11 07:39:45 -06:00
oranges
1f88c0c660 [READY]Cargo Update: Nanotrasen Supply Drop Pods! 2018-01-10 03:12:07 -06:00
deathride58
7280d91628 Minor boxstation changes, merges #4694 and #4697 2018-01-08 00:55:05 -05:00
Leo
889e281a57 Revert "Vending TGUI" 2017-12-26 09:10:48 -06:00
nicbn
da25df9329 Makes the chemical smoke machine use stock parts for things 2017-12-18 15:15:33 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
Ashe Higgs
0ae0c44991 Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more 2017-12-06 16:37:15 -06:00
deathride58
64aadb868e Merge branch 'master' into upstream-merge-33213 2017-12-04 21:39:30 +00:00
Ashe Higgs
5621507b4a Adds emergency lights, built into light fixtures 2017-12-03 12:54:48 -06:00
Matt Smith
a0cdca9e7c Fix turbine computer showing broken 2017-11-30 17:01:38 -06:00
Matt Smith
694958f587 Update Turbine computer to use TGUI 2017-11-21 22:28:14 -06:00