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-14 11:52:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,617 Commits 55 Branches 0 Tags
f76737dc0472ac901b245453b3d96c2ab8ec687a
Commit Graph

90 Commits

Author SHA1 Message Date
Thalpy
1cc0724519 Merge branch 'master' into Dwarf 2019-06-17 12:09:55 +01:00
kevinz000
78c969a9cb Merge pull request #8584 from Trilbyspaceclone/patch-172 
Organ Storage box
 2019-06-16 19:43:10 -07:00
Trilbyspaceclone
f32291146b Update all_nodes.dm 2019-06-14 12:02:55 -04:00
Trilbyspaceclone
0d7b769eee Merge branch 'master' into meteor 2019-06-09 17:01:06 -04:00
Trilbyspaceclone
b073c29b19 Update all_nodes.dm 2019-06-08 16:17:49 -04:00
Fermi
f44b9048af Added to vendors/tech. 2019-06-08 01:00:51 +01:00
CdrCross
82d308eb5e Defibrillator Upgrades Proofread 
My first ever contribution to Citadel, and first ever real GitHub Commit. This PR is a simple exercise in fixing and standardising some flavour text across Trilby's otherwise excellent defibrillator upgrades. (PR#8173)
No stats or gameplay elements have been adjusted.
 2019-05-21 23:37:28 +02:00
Sishen
c3df1b354e Satchel of holding 
fashion creep
 2019-05-09 20:44:07 -04:00
deathride58
9d6f85d555 Merge pull request #8292 from Citadel-Station-13/kevinz000-patch-47 
adds message monitor to telecomms technode
 2019-05-06 22:04:12 -04:00
kevinz000
cbc0607086 Merge pull request #8290 from Trilbyspaceclone/Laser_gun_adv 
Readds Laser carbines.
 2019-04-30 05:31:33 -07:00
kevinz000
da11e400b9 Update all_nodes.dm 2019-04-26 03:18:45 -07:00
Trilbyspaceclone
c033210577 Update all_nodes.dm 2019-04-26 00:43:37 -04:00
Trilbyspaceclone
875bd522d0 grammer 2019-04-15 22:45:08 -04:00
Trilbyspaceclone
cc06df001a Update all_nodes.dm 2019-04-14 23:20:09 -04:00
Trilbyspaceclone
94f97ba58d Update all_nodes.dm 2019-04-06 15:15:55 -04:00
kevinz000
997e975e1d Merge pull request #8170 from Trilbyspaceclone/Borgo 
Maybe adds adv health scanner to all borgs that have health scanners
 2019-04-02 05:37:22 -07:00
kevinz000
ebdd1ecce5 Merge pull request #8173 from Trilbyspaceclone/2.0Defibs 
Defib upgrade tech
 2019-04-02 05:35:04 -07:00
Seris02
c91fd98fb0 adds bluespace bio bags 2019-03-31 15:13:01 +08:00
Trilbyspaceclone
8bebae82f5 Update all_nodes.dm 2019-03-26 13:08:09 -04:00
Trilbyspaceclone
8752fd56da Update all_nodes.dm 2019-03-25 16:39:47 -04:00
Trilbyspaceclone
b27ab885f3 [Ready] Adds new huds that help correct vision. (#7943) 
* Fixing updater

* Adds the things

* Update all_nodes.dm

* Update misc_designs.dm

* Update hud.dm

* Update engine_goggles.dm

* Update _glasses.dm

* Update hud.dm

* Update packs.dm

* Update misc_designs.dm

* Update packs.dm

* Update hud.dm

* Update all_nodes.dm

* Update all_nodes.dm

* Update hud.dm

* Update misc_designs.dm
 2019-02-05 18:09:34 -08:00
deathride58
9047538620 Merge pull request #7884 from Citadel-Station-13/kevinz000-patch-13 
Readds drones
 2019-01-14 21:36:37 -05:00
Trilbyspaceclone
7e8ba9a23c [Ready] New adv surgery tools! (#7879) 
* Fixing updater

* Update tools.dm

* Update all_nodes.dm

* Update medical_designs.dm

* shit.jpg

* Update medical_designs.dm

* Update medical_designs.dm

* Apply suggestions from code review

Ragolutions' Grammar rework

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Apply suggestions from code review

Reg being the best

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Huh
 2019-01-08 02:36:43 -08:00
Trilbyspaceclone
a2ba37d664 Update all_nodes.dm (#7864) 2019-01-03 04:44:00 -08:00
Trilbyspaceclone
21f111b5e0 [Ready] New mech weapon, Melon Seed Scatter shot! - Requested and helped made by Elllsiy (#7873) 
* Fixing updater

* Adds the gunthingy

* makes the bullet

* Update mecha_designs.dm

* Update all_nodes.dm

* Fixes stam harm
 2019-01-03 04:38:10 -08:00
kevinz000
906922a3e3 Update all_nodes.dm 2019-01-03 04:30:24 -08:00
deathride58
500f068fe5 Merge pull request #7645 from Trilbyspaceclone/Tecweb_reblance 
[Ready] Re-balance Tech Web nodes and points
 2018-11-18 07:41:39 -05:00
deathride58
f385751c4a Brings back nonlethal 38 bullets in a semi-nerfed state, keeps the current lethal variant in as a brand new sec autolathe printable ammo box (#7723) 
* Brings back nonlethal 38 bullets in a semi-nerfed state, adds lethal variant for the c38 bullet available at autolathes

* Im drunk ignore me
 2018-11-16 14:46:54 -08:00
Trilbyspaceclone
202645ca10 Woops sorry! 2018-10-30 18:53:12 -04:00
Trilbyspaceclone
d4ab22be46 Fail-Coder 2018-10-28 21:23:24 -04:00
Trilbyspaceclone
4e4bfe7873 Merge branch 'master' into Bloody_bags 2018-10-28 20:51:53 -04:00
Trilbyspaceclone
b9f196991d Adds in the blood bag 2018-10-28 20:36:59 -04:00
Trilbyspaceclone
2194919129 Deal 2018-10-24 15:33:50 -04:00
Trilbyspaceclone
dc6dbe2715 Makes the lims get-able 2018-10-12 12:06:25 -04:00
Trilbyspaceclone
38846152ae Re-balance Mark II 2018-10-11 15:31:07 -04:00
Trilbyspaceclone
d97762e0e4 Re-balance Tech Web nodes and points (Feed back please) 2018-10-10 19:45:07 -04:00
Poojawa
afac3ae0ab Merge branch 'master' into changelog-memes 2018-09-11 07:52:59 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
997cb75f8f Merge pull request #7542 from Citadel-Station-13/kevinz000-patch-2 
adds prescription nvgs
 2018-09-10 18:51:05 -04:00
kevinz000
50c3a127f2 Update all_nodes.dm 2018-09-05 06:49:50 -07:00
Trilbyspaceclone
9a97c3ebd7 Makes a new blue space node! 2018-09-04 22:27:54 -04:00
kevinz000
b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
Cw 3040
0e1c78ca7b Adds temporary replacement for flightsuits (#7421) 
* update equipment_designs.dm

-adds Construction Hardsuit and Hardsuit Jetpack Upgrade to designs list

* update all_nodes.dm

-adds construction hardsuit and jetpack upgrade to tech node "EVA
Construction Equipment"
-requires advanced engineering and experimental tools, and 5000 tech
points

* update all_nodes.dm again

-i fucked up somehow
-forgot the display_name
 2018-08-17 20:14:18 -07:00
kevinz000
9547bed028 Update all_nodes.dm 2018-07-20 03:30:38 -07:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
Dennok
58f634db63 deconstructable-TEG (#38656) 
Make TEG deconstructable.
 2018-07-01 05:41:53 -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
CitadelStationBot
c2f9ff1358 [MIRROR] Anomaly Neutralizer (#6851) 
* Anomaly Neutralizer

* Update all_nodes.dm
 2018-05-27 17:20:37 -07:00
LetterJay
8c77b2d700 vr sleeper removal 2018-05-25 17:35:06 -05:00
LetterJay
742e6a076a Update all_nodes.dm 2018-05-20 00:44:33 -05:00