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-28 10:43:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,847 Commits 55 Branches 0 Tags
caed4b51b9ed1bf80dd1cae3bcdc1c1f7deb8a08
Commit Graph

828 Commits

Author SHA1 Message Date
silicons
a20f14b937 Merge pull request #13705 from Putnam3145/buff-rad-collector 
Buffs rad collectors
 2020-11-25 22:23:17 -07:00
silicons
f301ed4f8f Merge pull request #13689 from DeltaFire15/apc-power-fuckery 
Fixes APC recharge power use
 2020-11-25 22:21:57 -07:00
DeltaFire
ac20bb7d8c fixes up a tiiny cell charge oversight 2020-11-24 19:43:14 +01:00
Putnam
a7fc05a1c7 Buffs rad collectors. 2020-11-24 06:43:17 -08:00
DeltaFire
adc2af2dde typo 2020-11-18 22:51:54 +01:00
DeltaFire
e24b26c7e6 fixes APCs using nearly no power 2020-11-18 22:47:28 +01:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
DeltaFire15
91584053f5 Fixes a bunch of fallout from the tgui PR (#13648) 
* screamies

fixes a bunch of fallout from the tgui PR.. probably

* Empty commit to poke travis
 2020-11-01 21:59:22 +01:00
Arturlang
d3616f2d17 Fixes hijack UI (#13598) 
* Fixes hijack UI

* This was lost too it seems

* And this

* More stuff that was removed

* Should be good now

* Nice and proper now
 2020-10-24 21:23:52 +02:00
DeltaFire
4f734f68a9 moves damage checks 
title. Makes it harder to circumvent them.
 2020-10-11 16:18:25 +02:00
DeltaFire
a5fce4b6ed Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2 2020-10-11 15:39:41 +02:00
silicons
face07f532 Update supermatter.dm 2020-10-11 00:45:01 -07:00
BlackMajor
8be9e0aaad Merge pull request #13530 from Citadel-Station-13/silicons-patch-12 
THROWING A CLOWN INTO THE SUPERMATTER ENGINE NOW RANDOMLY ADJUSTS ENERGY AND DAMAGE
 2020-10-11 18:43:49 +13:00
silicons
b2336f1140 Merge pull request #13527 from ArchieBeepBoop/rtg 
Fully Upgraded Advanced RTG Machine Preset
 2020-10-10 22:01:20 -07:00
DeltaFire
4ccf40f775 Revert "Revert "Merge branch 'master' into robotic-limbs-PT2"" 
This reverts commit 27a099c6bf.
 2020-10-11 00:53:18 +02:00
DeltaFire
27a099c6bf Revert "Merge branch 'master' into robotic-limbs-PT2" 
This reverts commit 73b5267425, reversing
changes made to 2e780bfff2.
 2020-10-11 00:51:39 +02:00
DeltaFire
73b5267425 Merge branch 'master' into robotic-limbs-PT2 2020-10-11 00:44:28 +02:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
Timothy Teakettle
385bd57940 reworks family heirlooms, adds heirlooms that can be based off your species (#13444) 
* corgi tracker

* better heirloom system

* typo
 2020-10-10 12:15:39 +02:00
silicons
b341a71550 Update supermatter.dm 2020-10-06 11:52:18 -07:00
silicons
7a674fc51d Update supermatter.dm 2020-10-06 11:50:39 -07:00
DeltaFire
4146566af0 hoo boy 
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
 2020-10-06 17:34:13 +02:00
Dip
b81d1f5994 Fully Upgraded Advanced RTG Machine Preset 2020-10-06 05:26:40 -03:00
Timothy Teakettle
7726b0456c Merge branch 'master' into cool-ipcs 2020-10-01 21:06:16 +01:00
silicons
8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework 
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
 2020-10-01 03:01:18 -07:00
silicons
2b5a166425 Merge pull request #13421 from raspy-on-osu/teg-finale 
alters the TEG's logistic power generation
 2020-09-27 00:15:41 -07:00
raspy-on-osu
87d65d5c58 init 2020-09-22 15:11:46 -04:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Timothy Teakettle
12bf3aebda Merge remote-tracking branch 'upstream/master' into cool-ipcs 2020-09-16 05:12:20 +01:00
Timothy Teakettle
125b50d392 Merge branch 'master' into cool-ipcs 2020-09-16 05:09:02 +01:00
Timothy Teakettle
58737e42b9 empulse using range 2020-09-10 19:52:34 +01:00
timothyteakettle
e0f44ef717 new emps 2020-09-10 03:49:47 +01:00
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
BlackMajor
1943a2fdd7 Merge pull request #13246 from silicons/anomaly_manufacturing 
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
 2020-09-06 17:53:35 +12:00
raspy-on-osu
b186f8ac05 init 2020-09-02 20:26:43 -04:00
Artur
3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
silicons
50cf863501 Merge pull request #13263 from raspy-on-osu/tesla-groundingrodspull 
Tesla Counterplay.
 2020-08-29 21:24:41 -07:00
silicons
e16abbc945 Merge pull request #13280 from raspy-on-osu/teg-castration-2 
Further tweaks the TEG's power output
 2020-08-29 21:19:18 -07:00
Letter N
ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
raspy-on-osu
d116dd49b2 teg tweak 2020-08-27 23:04:00 -04:00
raspy-on-osu
172fe663c3 remove redundant separate tesla log and merge it into the singulo log 
also formatting because i hate inconsistent whitespace
 2020-08-27 02:46:19 -04:00
raspy-on-osu
350a99a4ba teslas now fizzle at 0 energy and adds admin log for fizzles 
fixing the tesla engine 100% speedrun world record
 2020-08-27 02:39:09 -04:00
raspy-on-osu
68cb78ba51 why is this here 
no really how the fuck did this happen
 2020-08-27 00:03:58 -04:00
raspy-on-osu
7840205d4e shuffle containment checking for optimization 
now it should be checking less (tested, functionally identical to before)
 2020-08-26 23:59:15 -04:00
raspy-on-osu
f3990732f3 remove excess whitespace 
title
 2020-08-26 21:25:45 -04:00
raspy-on-osu
6fc019ebf8 create unique containment check for the tesla 
it now functions as normal. it only checks for containment in a 10 tile radius (this should work fine for the default setups of Delta and Lambda).
 2020-08-26 21:20:23 -04:00
raspy-on-osu
46bec76f41 tesla can now be contained 
for whatever reason, the contained variable was unused for teslas, but now it is
unintentional side-effect may be that grounding rods for tesla containments with a larger than 1x1 tile space might get eaten (untested but assumed)
 2020-08-25 00:46:04 -04:00
raspy-on-osu
1a5248359c if(rods) literally just eats disk space and nothing more 
no longer. 300 bytes saved
 2020-08-24 23:46:38 -04:00
raspy-on-osu
2e5517b9f3 if committing above suggestion, remove these two lines 
ok done
 2020-08-24 23:36:37 -04:00
raspy-on-osu
1fdb233ede Update code/modules/power/tesla/energy_ball.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-08-24 23:35:17 -04:00