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-26 01:33:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,182 Commits 55 Branches 0 Tags
cd5317d1375d6e4efc901b807b9f52f52460699b
Commit Graph

164 Commits

Author SHA1 Message Date
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
726ace52eb merg conflict is this 2019-03-26 12:59:39 -04:00
Trilbyspaceclone
3feb70e1df Update mechfabricator_designs.dm 2019-03-25 16:38:10 -04:00
kevinz000
d681b30df5 Merge pull request #8102 from Trilbyspaceclone/semi-auto 
Fixes ever case I can fine of WT-550 Auto Rifle being called Auto Rifle and not Semi-Auto - SMG
 2019-03-10 13:44:57 -07:00
Trilbyspaceclone
5197c0fb94 Update weapon_designs.dm 2019-03-09 20:34:39 -05:00
Trilbyspaceclone
ce7c76e8a4 ? 2019-03-09 20:12:44 -05:00
Trilbyspaceclone
979f9125ef Update weapon_designs.dm 2019-03-09 19:54:48 -05: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
kevinz000
277b589f1f Update weapon_designs.dm 2019-01-04 03:44:47 -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
b041f3318c Update electronics_designs.dm 2019-01-03 04:29:36 -08: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
deathride58
f896a921ba Merge pull request #7677 from Tupinambis/SHODAN 
Makes all ion references to "humans" reference to "crew" instead.
 2018-10-30 18:33:46 -04:00
Trilbyspaceclone
e721fc3ea3 ^_^ 2018-10-28 21:05:26 -04:00
Trilbyspaceclone
4e4bfe7873 Merge branch 'master' into Bloody_bags 2018-10-28 20:51:53 -04:00
Trilbyspaceclone
ed8f552ba1 Renames 2018-10-28 20:39:52 -04:00
Trilbyspaceclone
5f47e3015f Stuff and bloody things 2018-10-28 20:34:35 -04:00
Tupinambis
db74ad4361 Fixes 2018-10-27 23:39:09 -05:00
Tupinambis
2e0cb266de Makes all ion references to "humans" reference to "crew" instead. 2018-10-27 21:01:03 -05:00
Trilbyspaceclone
c2c77a643a add the lims to be made 2018-10-12 12:05:18 -04:00
Poojawa
99e57fb221 various citadel tweaks/fixes 
remeber to add //citadel edit to base code changes because we're still a downstream and hard syncs are still a thing
 2018-09-17 03:26:05 -05:00
Poojawa
b00a76476c Oh hey, all of those compile fixes 2018-09-11 11:00:18 -05: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
kevinz000
dca6ea461b Update misc_designs.dm 2018-09-05 06:49:20 -07:00
deathride58
c8a3f56af6 Merge pull request #7489 from Citadel-Station-13/nanites 
Nanites port
 2018-09-03 13:47:28 -04:00
kevinz000
b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
Trilbyspaceclone
d871b33ecf Places Large grande into sci prolathen (#7487) 2018-08-23 00:27:48 -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
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
ac6fddcfb3 Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync 2018-07-05 00:17:44 -04:00
CitadelStationBot
6b0e597553 [MIRROR] Fix circuit printer printing finished TEG machinery (#7294) 
* Merge pull request #38844 from AutomaticFrenzy/patch/circuits

Fix circuit printer printing finished TEG machinery

* Fix circuit printer printing finished TEG machinery
 2018-07-02 03:23:49 -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
iksyp
aae6ea0203 [READY] Gives Stacking Machines and their consoles machine boards (#37607) 
* patch-2

* does everything on the TODO list

FUCK YEAH
*breaks up the engineering node design ID's for readability
*linking the device via multitool is possible
*The machinery construction "recipes" are less shit and make a bit more sense

* coil

* did somebody say RUNTIMES?

*fixed runtimes when there is no link on the stacking machine console
*added feedback for unlinked consoles
*it's -> its
*proper typecheck

* achieved with [src]
 2018-05-19 16:39:45 -05:00
Jordan Brown
9a1dfefb97 Merge pull request #37810 from 81Denton/techweb-electronics 
Adds basic electronics to techwebs
 2018-05-14 15:17:00 -05:00
FrozenGuy5
e9ef82513c Add plasma rein glass to the ORM & adjusts material values on the various glass sheets (#37464) 
* Update smelting_designs.dm

* Tweaks material values on titanium glass.

* Optimizes math & fixes errors and inconsistencies
 2018-05-13 06:13:36 -05:00
KorPhaeron
cc8fb19166 Anomaly Armour Research 2018-05-09 15:55:03 -05:00
LetterJay
0c5912c834 Merge pull request #6635 from Citadel-Station-13/upstream-merge-37626 
[MIRROR] You can no longer print infinite ammunition.
 2018-05-04 22:54:00 -05:00
CitadelStationBot
d574fc5590 Merge pull request #6622 from Citadel-Station-13/upstream-merge-37289 
[MIRROR] Science can now print off processors as well
 2018-05-03 09:07:59 -05:00
Dax Dupont
a8a31c9e4b You can no longer print infinite ammunition. (#37626) 
* You can no longer print infinite ammunition.

* henk

lazy

anus

Reduces .38

Casings now give a tiny bit of metal so the janitor gets a buff

spacing
 2018-05-03 08:45:17 -05:00
pigeons
2702788dac Removes stock market 2018-05-02 17:48:55 -05:00
Grandmother of 50
26fa3e1d12 Update machine_designs.dm (#37289) 2018-05-02 16:12:28 -05:00
deathride58
7d01eeeb35 Merge pull request #6593 from Citadel-Station-13/upstream-merge-37556 
[MIRROR] More holosigns for techwebs
 2018-05-02 01:23:19 +00:00