Commit Graph

6390 Commits

Author SHA1 Message Date
President of Shit PRS
d063144713 Re-Adding Bounty Consoles
Civilian bounties are great, don't get me wrong. But they're civilian bounties and it feels like cargo lost their thing to do, namely putting annoying sheets of paper everywhere. Plus checklists make the brain go ding when you work through them arooga.
2023-01-14 02:01:12 +00:00
Jerry Wester
ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
Lin
efb2d19cb9 Merge pull request #15921 from LeDrascol/port-furrypride-graffiti
[PORT] Furry Pride graffiti
2023-01-07 16:38:34 -07:00
silicons
23327fa268 Merge pull request #15894 from JerryWester/modsuits
MODsuits
2023-01-07 14:07:28 -08:00
Darius
4bea655c8b Port Furry Pride graffiti
Ports the large "Furry Pride" graffiti from TG.
2023-01-05 17:38:02 -05: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
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
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
20ffbf1a12 backport 2022-10-26 14:02:11 -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
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
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
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
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
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
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
shellspeed1
11ec2b89e0 borg pda 2022-09-17 02:40:37 -07:00
shellspeed1
8d9804e953 adds radio access to borgs by default 2022-09-17 02:20:36 -07:00
silicons
4f82820062 Merge pull request #15781 from zeroisthebiggay/breadbay
the great medbay resprite PR: ported from a freshly merged TG PR
2022-08-20 12:24:46 -07:00
Putnam3145
d08a570c5f Makes binary translator not show a wrong description 2022-08-18 21:51:39 -07:00
Cognition
0c12f3f111 Removes persistence from glowing goo 2022-08-16 19:49:16 -06:00
zerothebigboy
d5b380d7b3 iloathecitadelchanges 2022-08-13 18:22:30 -04:00
zerothebigboy
4e0498573f thefartdomeengages 2022-08-13 18:16:37 -04:00
Timothy Teakettle
325d467ac5 Update mirror.dm 2022-08-13 18:45:25 +01:00
zerothebigboy
1bc3796b06 watchmegetgitbanned 2022-08-11 19:17:16 -04:00
timothyteakettle
2313a24918 Merge branch 'master' into dullahan-2-electric-boogaloo 2022-08-11 14:43:48 +01:00
Putnam3145
b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
Timothy Teakettle
818e564c92 stable 2022-08-05 15:44:40 +01:00
Linzolle
cd1389ae0f fix catwalks 2022-08-02 22:59:59 -07:00
silicons
76cac539b5 Update defib.dm 2022-07-31 16:42:38 -07:00
silicons
eb7b3f706f Update closets.dm 2022-07-28 16:17:46 -07:00
SandPoot
33bfcf67b5 solves missing keyword args 2022-07-03 01:37:26 -03:00