BongaTheProto and GitHub
a1c93d4767
Merge branch 'Sandstorm-Station:master' into master
2022-11-09 19:12:06 -05:00
SandPoot
ba6d614e6a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-11-09 20:50:44 -03:00
Fabian272
939d0bcfd0
Changes the kinkmate loincloth to have sensors, changes loincloth crafting to have sensored and sensorless versions.
2022-11-07 21:36:42 +01:00
Hatterhat and GitHub
20ffbf1a12
backport
2022-10-26 14:02:11 -05:00
BongaTheProto
bad153f1a3
object(s)
...
S
2022-10-15 17:05:06 -05:00
BongaTheProto
79fa770ab3
Merge remote-tracking branch 'upstream/master'
2022-10-13 11:21:32 -05:00
SandPoot
5384cb9d4b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-10-12 22:25:25 -03:00
silicons and GitHub
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
BongaTheProto
f0b7bd40a6
follow-up
...
because some stuff got ported
2022-09-27 23:39:10 -05:00
BongaTheProto
e1cb9c8346
Merge remote-tracking branch 'upstream/master'
2022-09-27 23:19:10 -05:00
SandPoot
f039efca97
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-27 01:19:55 -03:00
shellspeed1 and GitHub
142c07c51d
Merge branch 'master' into premium-kas-for-borgs
2022-09-23 17:00:02 -07:00
silicons and GitHub
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 and GitHub
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 and GitHub
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
Satile1
4718bdc67a
Adds scan_state to bluespace crystals
2022-09-21 22:01:40 +01: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
BongaTheProto
9cdaffc417
Merge remote-tracking branch 'upstream/master'
2022-09-18 23:40:20 -05: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
SandPoot
cc9c36bd13
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-17 22:48:51 -03:00
shellspeed1 and GitHub
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
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
BongaTheProto and GitHub
be8257f968
Merge pull request #459 from Zirok-BYOND/fix-harddels
...
Fix various hard dels
2022-09-03 12:20:54 -05:00
Zirok
2d2d94b523
Fix /datum/gas_mixture and another jetpack-related typepath hard deleting.
2022-08-27 19:28:44 +02:00
Pin-alternative
9e377c644b
Merge remote-tracking branch 'upstream/master' into cursed
2022-08-23 07:41:40 +10:00
BongaTheProto
3341812b44
Merge remote-tracking branch 'upstream/master'
2022-08-20 17:16:19 -05:00
SandPoot
550db1b6ee
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-20 17:27:19 -03:00
silicons and GitHub
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
Pin-alternative
9ba41fb085
Merge remote-tracking branch 'upstream/master' into cursed
2022-08-15 07:55:25 +10:00
zerothebigboy
d5b380d7b3
iloathecitadelchanges
2022-08-13 18:22:30 -04:00
zerothebigboy
4e0498573f
thefartdomeengages
2022-08-13 18:16:37 -04:00
zerothebigboy
1bc3796b06
watchmegetgitbanned
2022-08-11 19:17:16 -04:00
BongaTheProto
9e7c5033cc
Merge remote-tracking branch 'upstream/master'
2022-08-07 21:42:16 -05:00
SandPoot
00dadda3df
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-07 23:15:57 -03: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
SandPoot
6108e1d522
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-07 19:46:26 -03:00
Pin-alternative
4ad46f4f5f
Merge remote-tracking branch 'upstream/master' into cursed
2022-08-08 08:04:31 +10:00
BongaTheProto
0563def679
Merge remote-tracking branch 'upstream/master'
2022-08-03 17:41:43 -05:00
SandPoot
3be808e51e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-03 18:42:49 -03:00
Linzolle
cd1389ae0f
fix catwalks
2022-08-02 22:59:59 -07:00
silicons and GitHub
76cac539b5
Update defib.dm
2022-07-31 16:42:38 -07:00
Pin-alternative
58eac01841
Merge remote-tracking branch 'upstream/master' into cursed
2022-07-17 20:57:03 +10:00
BongaTheProto and GitHub
16ecfb8078
Merge pull request #359 from Yatiyaya/Zombie-unfuckery
...
Updating the zombie race to support modular creation
2022-07-15 18:10:11 -05:00
