Thalpy
597160ca15
Fixed werid stuff.
2019-10-15 14:17:36 +01:00
Thalpy
e115c456f3
Ohh I'm fixing
2019-10-15 13:41:49 +01:00
Thalpy
e71a70f406
Adds medolier + bag antics
2019-10-15 11:40:07 +01:00
Thalpy
23743c8630
Updates chemmaster
2019-10-15 11:21:05 +01:00
Ghommie
cac4157894
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-10-05 22:03:37 +02: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
Ghommie
c813555697
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-09-15 04:05:14 +02:00
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
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
Ghommie
5d1cac62da
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-08-24 13:50:22 +02: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
87b412a8c4
Recompiling gui stuff.
2019-07-28 23:38:10 +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
Ghommie
b818b1eedd
Updating spraycans and crayons code.
2019-07-17 15:45:48 +02:00
Ghommie
4df4cbd721
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-07-15 17:23:01 +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
Ghommie
8df59b0b5c
Recompiling TGUI.
2019-07-12 05:56:21 +02:00
Ghommie
8004165599
The big part is done.
2019-07-04 00:30:28 +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
bc0d14c193
Continual updates until merged
2018-09-17 04:55:03 -05:00
Poojawa
1a2460ed28
Continous update intergration until being merged
...
Also tgui fixes/updates
2018-09-15 00:37:29 -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
LetterJay
33b8ea8475
Merge pull request #7155 from Citadel-Station-13/upstream-merge-38536
...
[MIRROR] Update node dependencies
2018-06-18 12:19:50 -05:00
LetterJay
8393a6b34b
Merge pull request #7133 from Citadel-Station-13/upstream-merge-38510
...
[MIRROR] Cleans up the chem synths jesus christ what the fuck
2018-06-18 09:52:24 -05:00
Tad Hardesty
0af6946aad
Update node dependencies
2018-06-18 09:37:05 -05:00
Dax Dupont
899d1e2d73
Cleans up the chem synths jesus christ what the fuck
2018-06-16 15:38:22 -05:00
Dax Dupont
fdc0eadfbd
Adds package-lock as requested by Cyberboss ( #38516 )
2018-06-16 06:18:26 -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
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