Commit Graph

10269 Commits

Author SHA1 Message Date
SandPoot
c60f36a42b files 2023-01-28 01:10:49 -03:00
silicons
23327fa268 Merge pull request #15894 from JerryWester/modsuits
MODsuits
2023-01-07 14:07:28 -08:00
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
Lin
b5d794a6b3 Merge pull request #15916 from LeDrascol/mop-sprite-fix
Fix Advanced Mop inhands sprite
2023-01-04 21:50:54 -07:00
Darius
e5813bec20 Play BSLR effects only when replacing
Prevents the Bluespace Light Replacer from playing sounds or displaying a beam when the target's light won't be replaced. Based on the BSRPED's behavior.
2023-01-03 14:36:56 -05:00
Darius
7dc500e526 Fix Advanced Mop inhands sprite
Restores the sprite to it's unique advmop variant, and fixes a sprite order issue.
2023-01-03 13:10:48 -05:00
Darius
d3e018720c Port the Bluespace Light Replacer
- Ports the Bluespace Light Replacer from TG
-- Added to Applied Bluespace Research instead of Advanced Sanitation Technology
- Makes the basic Light Replacer a default tech node
2022-12-24 15:57:11 -05:00
Jerry Wester
d3c72669d9 clean up & remove longfall boots 2022-12-20 02:03:45 -07:00
Jerry Wester
b1b4f96053 fix hilbert analyzer in RD locker 2022-12-17 20:10:41 -07: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
Jerry Wester
b52e7a5657 ion jetpack module 2022-12-14 23:36:47 -07:00
Lin
7d0c3df2ad Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
Jerry Wester
32a5d02434 Merge branch 'master' into modsuits 2022-12-13 19:18:24 -07:00
Jerry Wester
19428e2579 revert bag dumping changes 2022-12-13 19:15:07 -07:00
Jerry Wester
94bfa88ed9 add more platings 2022-12-13 19:14:43 -07:00
Lin
7205781c47 Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
Solves some harddels
2022-12-12 19:11:49 -07:00
Jerry Wester
dae5190941 Remove sandstorm edit, fix suit storage 2022-12-11 20:45:46 -07:00
Jerry Wester
7913a12492 suits rechargeable from recharge station 2022-12-11 20:32:43 -07:00
Jerry Wester
f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
PeriodicChaos
183b554ed3 modsuits part 1 2022-12-11 20:30:41 -07:00
SandPoot
8911fe5e0b clear em 2022-12-11 17:58:45 -03:00
Hatterhat
bab984be30 i hate runtimestation i hate runtimestation 2022-10-31 11:50:54 -05:00
Hatterhat
20ffbf1a12 backport 2022-10-26 14:02:11 -05:00
Lin
03c62f4359 Merge pull request #15876 from SandPoot/fix-deadchat_broadcast
Fixes deadchat_broadcast
2022-10-25 04:36:00 +00:00
SandPoot
24ee6077c7 push changes 2022-10-23 00:18:03 -03: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
e4d687da0c Merge pull request #15857 from shellspeed1/premium-kas-for-borgs
Readds the premium ka for borgs
2022-10-08 15:39:19 -07:00
silicons
93e8a69c4c Revert "Updates auxmos to 2.0.0" 2022-09-28 01:05:10 -07:00
shellspeed1
142c07c51d Merge branch 'master' into premium-kas-for-borgs 2022-09-23 17:00:02 -07:00
silicons
b0703d1bd9 Merge pull request #15854 from shellspeed1/borg-radio-improvements
Ports Adding radio access to borgs by default from splurt. Credit to NopemanMcHalt for the splurt port and Ayfa212 for the initial work.
2022-09-23 16:26:54 -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
silicons
fbf7a2de90 Merge pull request #15853 from shellspeed1/posialert-console
Port of the Posialert console from hyper. Credit to jjpark-kb for initial work.
2022-09-23 16:21:19 -07:00
silicons
c2f1e24223 Merge pull request #15832 from Putnam3145/from-ghost-check
Makes from-ghost midrounds not roll if no ghosts
2022-09-23 16:21:08 -07:00
silicons
ef38bc5522 Merge pull request #15858 from Putnam3145/auxmos-2
Updates auxmos to 2.0.0
2022-09-23 16:20:31 -07:00
silicons
a1fc1e0377 Merge pull request #15855 from shellspeed1/borg-pda-addition
Ports borg pdas from hyper. Credit to haha26315 for the orginal PR and BongaTheProto for their port to splurt.
2022-09-23 16:16:03 -07:00
shellspeed1
de4d468472 lets not have bounty cubes worth a bunch more than they should be. port of https://github.com/tgstation/tgstation/pull/56914 Credit to cacogen. 2022-09-20 20:55:38 -07:00
shellspeed1
a55b2c4ff3 ports https://github.com/tgstation/tgstation/pull/56375. Credit to cacogen. 2022-09-20 20:05:59 -07:00
shellspeed1
44536ad7ab Fixes a runtime which bricked the pad plus fixing sprites. Also ports https://github.com/tgstation/tgstation/pull/55533 credit to cacogen. 2022-09-20 16:57:49 -07:00
shellspeed1
e3a3462b85 bounty bugfix 2022-09-20 13:37:14 -07:00
shellspeed1
40dc7d57c3 port of https://github.com/tgstation/tgstation/pull/55762, credit to ArcaneMusic. 2022-09-18 22:40:07 -07:00
shellspeed1
aa7252ffd6 port of 418c58a9c3 to make pad deconstructible. 2022-09-18 22:13:44 -07:00
shellspeed1
cdb1fbb1e2 port of https://github.com/tgstation/tgstation/pull/54029/files# Aka this is where we get bounty cubes and remove the public bounty console. Credit to ArcaneMusic. 2022-09-18 21:55:10 -07:00
shellspeed1
b4f886d999 port of https://github.com/tgstation/tgstation/pull/49111 aka sales taggers, credit to ArcaneMusic 2022-09-18 20:55:22 -07:00
Putnam3145
eb6a86f37f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxmos-2 2022-09-18 16:41:24 -07:00
Putnam3145
d95f5729cc wow i forgot some extremely important updates haha 2022-09-18 16:27:48 -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
236e9e5e0c ports launchpad targeting icon. (#15844) 2022-09-17 13:40:32 -07:00
shellspeed1
d83747dc74 Ports Quantum Spin Inverter from TG. (#15846)
* ports bluespace swapper

* fixes materials so we can print quantum spin inverters

* its diamond not diamoond
2022-09-17 13:39:32 -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