cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,854 Commits 55 Branches 0 Tags
68a30e9969bbd199809a80a679dae50754088ca9
Commit Graph

197 Commits

Author SHA1 Message Date
Fermi
68a30e9969 Final pass 2019-11-20 12:11:44 +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
bf89df7e7b Fixing things 2019-11-19 16:03:33 +00:00
Thalpy
c0287cf7b5 Reagent sleepers! 2019-11-19 14:50:22 +00:00
Thalpy
2eb33afcd6 Workin 2019-11-19 14:19:51 +00:00
Fermi
9fb6c2f3a3 Okay I gotta hop 2019-11-19 12:22:53 +00:00
kevinz000
c3dd0ad388 Merge pull request #9700 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/lodash.merge-4.6.2 
Bump lodash.merge from 4.6.1 to 4.6.2 in /tgui
 2019-11-10 11:32:51 -07:00
kevinz000
152938f0b1 Merge pull request #9701 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/mixin-deep-1.3.2 
Bump mixin-deep from 1.3.1 to 1.3.2 in /tgui
 2019-11-10 11:32:27 -07:00
dependabot[bot]
bf562de84e Bump lodash from 4.17.11 to 4.17.15 in /tgui 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.15.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.15)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-11-03 13:23:40 +00:00
dependabot[bot]
774696b518 Bump mixin-deep from 1.3.1 to 1.3.2 in /tgui 
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-11-03 13:22:50 +00:00
dependabot[bot]
e09412b64e Bump lodash.merge from 4.6.1 to 4.6.2 in /tgui 
Bumps [lodash.merge](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-11-03 13:22:37 +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
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