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-12 10:53:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,908 Commits 55 Branches 0 Tags
5029af901b173475bb4d5ce480e89f0ca87d3d3b
Commit Graph

43 Commits

Author SHA1 Message Date
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
Sneakyrat6
d5b0251cb5 Merge branch 'master' into matContainer 2021-03-09 05:42:47 -05:00
Sneakyrat6
395bdaf5f9 removes code i commented out 2021-03-07 04:13:18 -05:00
Sneakyrat6
703567e591 other fixes 2021-03-07 04:09:36 -05:00
Sneakyrat6
f875218284 Fixes material component 2021-03-06 03:48:52 -05:00
Letter N
edfe7220c4 lintfix 2021-03-05 15:45:57 +08:00
Letter N
cb346a3847 a 2021-03-05 14:29:36 +08:00
Letter N
819ca63456 https://github.com/tgstation/tgstation/pull/51679 - pickup_item missing 2020-07-16 20:42:02 +08:00
Ghom
f3af445c94 Update material_container.dm (#12491) 2020-06-08 09:09:53 -07:00
Ghom
8a0ed38a58 Fixing a few issues with the nutrition adjustment proc and the circuit printer. (#12320) 2020-05-21 10:10:59 -07:00
Ghommie
f2c8a7cd6f Porting a couple material datums code updates and fixes. 2020-03-04 15:59:46 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Ghommie
21f15e411d Part 3 2019-11-19 19:34:42 +01:00
Poojawa
b6430559e9 datums 2018-09-11 02:49:41 -05:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
Jordan Brown
e582e7019e Merge pull request #38023 from AutomaticFrenzy/patch/toh-kay 
Fix various bugs with telekinesis
 2018-05-25 10:49:21 -05:00
LetterJay
6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00
deathride58
725634c9ea Update material_container.dm 2018-05-06 03:09:47 -04:00
Fox McCloud
f5031bc4f7 Fixes Several Machines Materials Insertion (#37432) 
* Fixes Several Machines Materials Insertion

* attackby disable and show on examine fix
 2018-05-04 04:40:56 -05:00
vuonojenmustaturska
0958d35b26 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 2018-05-02 13:14:43 -05:00
arsserpentarium
303272319a [READY]pathfinding circuitry upgrade (#36398) 
* all in one

* fixfixfix

* uhhhh

* demuxdemuxdemuxdemux

* wire eriw

* icon noci

* tihsxifixshit

* rewopower

* fixif

* screeneercs

* returnruter
 2018-03-26 11:01:22 -05:00
CitadelStationBot
7b3b1f65ec [MIRROR] Adds two new intermediate beaker types to chemistry (#6018) 
* Adds two new intermediate beaker types to chemistry

* YAY I DON'T HAVE TO KEEP UP WITH SNOWFLAKE ANYMORE

* Update all_nodes.dm
 2018-03-19 22:17:05 -05:00
CitadelStationBot
1fd5de5bfe [MIRROR] Fixes stacks and material containers, fixes wet floors (#6008) 
* Fixes stacks and material containers, fixes wet floors (#36497)

* Fixes stacks and material containers, fixes wet floors
 2018-03-19 21:06:33 -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
Zna12
1585de0687 [Ready to merge] Au-toy-lathe (#5534) 
* Autoylathe Complete.

All the errors with the autoylathe should be fixed for now

* Toylathe Tweaking and plastic's initializing.

Well, this gets plastics halfway there. The toylathe now has 8 categories to choose from and some other sutff. It's all coming back.

* TOY LATHE NOW ACCEPTING PLASTIC

TOYLATHE IS WORKING AND RUNNING PROPERLY. SOME GUNS HAVE BEEN ADDED AND WILL NEED MORE TIME TO ADD MORE GUNS.

* Toy Datum construction.

Building some datums for the toys for the autoylathe to print.

* Toys toys toys

Adding toys to the list woo

* Autoylathe complete.

Holy shit it's fucking done.

* Fixes a duplicate id.

Also adds some shit to the hacked list.

* Okay this shit needs to stop

Rogue indentations? Nani?

* ugh

fuck

* Rogue indents

* Power issues

Fixes power scaling and the draining an APC

* Rogue File deletion.

Part of an early experiment that didn't work out.

* Some other tweaks and shit

Moves datums to the autoylathe designs and also fixes a dumb mistake I made.

* Clamps?

Added a clamp. Who knew?

* Shit.

Won't compile if it keeps looking for a file that doesn't exist

* Woops

Deleted a line not paying attention

* reworked initialize

I think I did this right.

* Revert "reworked initialize"

This reverts commit 649c156baebd64b6cd84e95f2f4c3cbd70dabce7.

* Odd variables that don't have any other references in the coding.

Why are these even here? Seriously.

* UNUSED VARIABLE?!

NANI?! Deleted. Don't need em.
 2018-02-17 17:18:22 -08:00
ShizCalev
f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
CitadelStationBot
7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327) 
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
 2018-02-06 19:06:31 -06:00
deathride58
9e0f8384e5 ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS 2018-01-17 23:51:54 -05:00
Leo
2da318a9a5 Merge pull request #33820 from tgstation/Cyberboss-patch-4 
Material containers only insert on help intent
 2017-12-26 09:25:14 -06:00
Leo
2221d854a1 Merge pull request #33446 from tgstation/Cyberboss-patch-3 
INVOKE_ASYNC is the exception not the rule!
 2017-12-11 20:39:38 -06:00
Jordan Brown
dfaa796fc2 Fixes certain material containers 2017-12-08 12:11:46 -06:00
Jordan Brown
e1f658a50d Removes ComponentActivated in favor of callbacks 2017-12-05 15:42:47 -06:00
Emmett Gaines
b8e754500c Bitflag returns from component signals (#33186) 
* For more useful returns from sendsignal

* removes a needless else/indentation

* cleanup
 2017-12-01 13:09:22 -06:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
kevinz000
9deb3df6af Update material_container.dm (#31555) 2017-10-12 10:39:20 -05:00
kevinz000
a6ac800db0 Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser (#31399) 
* precision

* precision

* sanity checks

* itt kevinz doesn't know how cyberboss procs work

* fixes

* allows user cancellation

* im dumb

* itt: im still dumb

* fixes stuff, makes it set on init

* refactors reagentgrinder code

* more fixes, prevents melee attacks from going anyways

* ...? wtf is with usetopic

* Finally found out what's wrongw ith this thing.

* fixes a mistake
 2017-10-10 03:11:50 -05:00
AnturK
67f0c2f41c Fixes mech fab runtime (#31232) 
* Dunno what the initial was about, it's a list.

* Proper fixup

* Typo
 2017-10-03 18:19:40 -05:00
CitadelStationBot
aaa2a214cb [MIRROR] Fixes material container flags precedence (#3029) 
* Fixes material container flags precedence

* Update material_container.dm
 2017-09-30 12:39:57 -07:00
Poojawa
573a81a4d9 Reapplies material componets 2017-09-22 09:31:39 -05:00
Poojawa
5f1d88ffeb Revert "[MIRROR] Port material containers to datum components" (#2597) 
* Revert "sprite fix on kitsune tails"

This reverts commit 44d5b21a43.

* Revert "Update vg_clothing_packs.dm (#2591)"

This reverts commit 7f46280d6b.

* Revert "Automatic changelog generation for PR #2590 [ci skip]"

This reverts commit 201e07033f.

* Revert "[MIRROR] Gives the detective a mass spectrometer (#2590)"

This reverts commit 5c98b9a13b.

* Revert "Quick sync (#2587)"

This reverts commit 92e055be97.

* Revert "Automatic changelog generation for PR #2557 [ci skip]"

This reverts commit 241a10d88d.

* Revert "Decreases hacked ai module cost (#2557)"

This reverts commit d959b7538a.

* Revert "[MIRROR] Port material containers to datum components (#2562)"

This reverts commit 32300086d5.
 2017-09-04 09:07:40 -05:00
CitadelStationBot
32300086d5 [MIRROR] Port material containers to datum components (#2562) 
* Port material containers to datum components

* Fixes Rej
 2017-09-04 04:08:42 -05:00