Commit Graph

903 Commits

Author SHA1 Message Date
SandPoot
535c1c623e Merge pull request #15896 from LeDrascol/fix-machine-init-process
Fix init_process not preventing processing
2023-01-07 15:44:58 -03:00
Darius
b8079b108f Move furnace init variable
Moves the init_process variable above the var defines to drastically improve style.

Requested by SandPoot.
2022-12-26 22:35:22 -05:00
Hatterhat
50a0991ce3 minor point dupe kill 2022-12-26 12:00:54 -06:00
Darius
dae235f97c Selective mineral machine init_process
Requested by SandPoot. Disables init_process for mineral (mining) machines, and enables it on a case-by-case basis.

Downstream mineral machines must be updated with this change.
2022-12-23 16:16:57 -05:00
Darius
bcae0e66ff Fix init_process not preventing processing
Prevents machines from running faster when set to both not init_process and not speed_process.

Changes mineral machine to init_process to fix potential issues caused by this.
2022-12-16 16:25:45 -05:00
Hatterhat
bab984be30 i hate runtimestation i hate runtimestation 2022-10-31 11:50:54 -05:00
silicons
f7937e54e0 Merge pull request #15860 from shellspeed1/public-bounties
Port of public bounties and the sales tagger from tg.
2022-10-12 03:27:37 -07:00
silicons
d91100c0f2 Merge pull request #15867 from Hatterhat/fists
[READY FOR REVIEW] [FRAMEWORK] kinetic brawling - the kinetic gauntlets rework nobody asked for
2022-10-08 19:57:37 -07:00
Hatterhat
282cc819dc works on my machine 2022-10-04 20:10:09 -05:00
Hatterhat
38bd037b66 box that mf up 2022-10-04 14:14:04 -05:00
shellspeed1
142c07c51d Merge branch 'master' into premium-kas-for-borgs 2022-09-23 17:00:02 -07:00
silicons
96384ac667 Merge pull request #15856 from shellspeed1/borg-mining-ID-fix-and-premium-KA-return
Fixes the mining borg point card
2022-09-23 16:24:36 -07:00
shellspeed1
3dace329be adds public bounty consoles without inflation, also removes the mint 2022-09-17 19:27:40 -07:00
shellspeed1
2d90e0ab33 readds the premium ka but for borgs 2022-09-17 19:03:03 -07:00
shellspeed1
d9e15776ee Ports the RBMK reactor from both NSV using Hyper and Splurt code (WIP) (#15847)
* sprites and sounds

* The code for the reactor itself

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Map stuff

* Removes Clamps.

* Matrices separated, this was a mistake on my part.

* Update tgstation.dme

* removal as per putnam's review

* redfines highest available as 1007

* possible soundloop fix? probably not.

* temporary config thing to make engine load

* changes to map template from splurt

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* actually somehow fixed the runtimes?

* old maps from hyper, not needed..

* Revert "old maps from hyper, not needed.."

This reverts commit 92ccd89952d360206926d8b57e82084994a6a0d6.

* take two on removal

* fixes power output

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* deals with the double turf

* Revert "temporary config thing to make engine load"

This reverts commit 7f52188d5261cd60024ef36cf7c33df0748d0c79.

* was told to bring it back

* don't need to change these

* next time I'll just copy paste it instead of type it.

* a

* Flexi Seal crate so we can fix the reactor

* set power to 0 so it can be fixed

* nerfs power output

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
2022-09-17 13:33:51 -07:00
shellspeed1
22d22447d2 removes the premium KA 2022-09-17 06:36:49 -07:00
shellspeed1
d7a2f14298 fixes and ka 2022-09-17 03:46:24 -07:00
zeroisthebiggay
7aeec9b083 replaces weight machine sprites with TG's and subsequently wipes a portion of the goon file's existence (#15829)
* basedado

* becnhpress
2022-08-31 21:38:44 -07:00
silicons
4a6358d2f4 Merge pull request #15806 from shellspeed1/new-mining-pods
Penthouse pod rework plus new garden pod.
2022-08-26 10:18:13 -07:00
shellspeed1
2e6ff742a9 minor change to map template description. 2022-08-24 15:15:36 -07:00
shellspeed1
d175b4d247 capitalization stuff 2022-08-24 15:13:19 -07:00
shellspeed1
f030d0038f New garden pod 2022-08-21 05:00:26 -07:00
silicons
bfd3aadab1 Merge pull request #15773 from zeroisthebiggay/mining
mining drills scanners and crushers getting a TG inspired glow up
2022-08-20 12:27:20 -07:00
silicons
d438103cf9 Merge pull request #15761 from Hatterhat/fatrolling
bloodborne (adds dodgeroll combat RMB to the cleaving saw, confers melee/projectile iframes)
2022-08-20 12:27:04 -07:00
zerothebigboy
4c2fc18a0a cheesed to meet you 2022-08-10 11:13:58 -04:00
zerothebigboy
f39de3b781 yeah 2022-08-09 13:26:13 -04:00
Hatterhat
c91d12ef93 qstep 2022-08-06 21:42:55 -05:00
Hatterhat
fdd03402ed dark souls 2022-08-06 16:25:28 -05:00
Hatterhat
44b23b873d crusher rename + 350 chr limit descs 2022-08-05 17:41:41 -05:00
SandPoot
2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
Lin
fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00:00
SandPoot
695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
silicons
dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
Artur
c36019bf56 Adds stasis beds 2022-04-06 15:38:05 +03:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
Solaris-Shade
0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00
Solaris-Shade
2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
Lin
1adbf914c2 Merge pull request #15414 from BlueWildrose/wingport
TG wing ports with some Citadel additions. All species can now use the flight potion and grow (unique) wings.
2022-02-21 00:02:21 +00:00
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
silicons
2b726d7670 Merge pull request #15324 from Trilbyspaceclone/ashtree
Ashen tree!
2022-01-22 04:34:28 -08:00
Hatterhat
0077f682fd crusher gauntlets - resonator hitsound, sharpness to SHARP_NONE (#15458)
* boo womp

* wrongsonator

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2022-01-09 18:46:48 +01:00
Cognition
c1a41394da flight fixes, pick all wing types if second wing potion chugged, a fucking slime species fix 2021-12-29 22:20:27 -07:00
BlueWildrose
0e3d30e59f Merge branch 'Citadel-Station-13:master' into wingport 2021-12-11 12:53:03 -07:00
DeltaFire
50be57f107 grrrr 2021-12-08 18:33:06 +01:00
Cognition
318240bdc6 TG wing port - Now YOU TOO, can be an "angel" 2021-12-07 18:59:07 -07:00
Lin
d5c17f0d84 Merge pull request #15376 from SandPoot/double
Double beds
2021-11-24 17:38:10 +00:00
Lin
e3a5391250 Merge pull request #14868 from Arturlang/admin_mapsave
buildmode mapgen tool save [ready]
2021-11-24 17:32:48 +00:00
Artur
99dedb54ed Merge remote-tracking branch 'upstream/master' into admin_mapsave 2021-11-20 00:16:56 +02:00