Commit Graph

141 Commits

Author SHA1 Message Date
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
vuonojenmustaturska
c33ab6221b Removes an unnecessary file causing github security warnings on tgui, also updates/downgrades some dependencies to ensure a build 2018-04-29 15:56:51 -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
7b17428939 recompiles tgui 2018-04-23 04:33:38 -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
Poojawa
86b11050b6 Citadel's folder's end (#5828)
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
2018-03-06 17:40:48 -06:00
Poojawa
2117e8ecb0 recompiles tgui 2018-03-04 20:16:10 -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
Poojawa
26240bbca4 recompiles tgui 2018-02-21 19:37:38 -06:00
Jordan Brown
bc2f2a9728 [READY]Randomized Station Time + Night Shifts 2018-02-21 12:02:28 -06:00
Poojawa
18bc99c252 recompiled tgui 2018-02-16 01:54:10 -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
Poojawa
40943eaa35 recompiled tgui 2018-02-05 06:28: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
Poojawa
d7f2ab2b66 tgui compiled 2018-01-29 06:31:21 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
AnturK
5164e38104 Fixes tgui reload script (#34632)
* Fixes reload bat

* That's possible
2018-01-20 22:05:04 -06:00
yorii
6a485fa8df removes the "and clear buffer" text on eject button 2018-01-11 07:39:45 -06:00
deathride58
9a33ac7177 TGUI recompile, fixes map conflicts 2018-01-11 00:05:34 -05:00
oranges
1f88c0c660 [READY]Cargo Update: Nanotrasen Supply Drop Pods! 2018-01-10 03:12:07 -06:00
deathride58
e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
deathride58
7280d91628 Minor boxstation changes, merges #4694 and #4697 2018-01-08 00:55:05 -05:00
Jordan Brown
0c606646e3 Merge pull request #34148 from MoreRobustThanYou/patch-44
Make tgui reload.bat work
2018-01-07 19:59:45 -06:00
Leo
889e281a57 Revert "Vending TGUI" 2017-12-26 09:10:48 -06:00
Jordan Brown
95354a388f Vending TGUI 2017-12-24 15:03:38 -06:00
Jordan Brown
17c9a5ab0b Merge pull request #33775 from MoreRobustThanYou/patch-39
Revert gulpfs version to 6d71a65 in tgui
2017-12-23 08:04:47 -06:00
nicbn
da25df9329 Makes the chemical smoke machine use stock parts for things 2017-12-18 15:15:33 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08: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
LetterJay
aaeb9331f5 tgui recompile 2017-12-10 14:19:39 -06: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
ff93a0cd6c rebuilds tgui correctly 2017-12-04 16:56:14 -05:00
deathride58
8a75e55b42 Merge branch 'upstream-merge-33213' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33213 2017-12-04 16:54:32 -05:00
deathride58
9cdaac3640 updates tgui and adds the missing lighting.dmi 2017-12-04 16:53:49 -05: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
LetterJay
efceed4277 tgui 2017-12-03 06:09:42 -06:00
Matt Smith
a0cdca9e7c Fix turbine computer showing broken 2017-11-30 17:01:38 -06:00
deathride58
b90b18cc27 recompiles tgui 2017-11-22 15:38:43 -05:00