Commit Graph
566 Commits
Author SHA1 Message Date
BongaTheProto e3d1286cb8 Merge remote-tracking branch 'upstream/master' 2023-11-23 17:23:16 -05:00
SandPoot c519c1e128 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-11-21 15:00:51 -03:00
shellspeed1andGitHub 912e0b3d51 Update lavaland_surface_seed_vault.dmm (#15835) 2023-11-13 10:18:43 +01:00
K4rlox 4bd766010c done 2023-09-28 00:08:46 +03:00
Vhariik 04c976de9d adds navbeacons 2023-08-27 09:41:26 -03:00
BongaTheProto 1ba8d0f7f0 Merge branch 'pr/834' 2023-08-22 18:26:12 -05:00
PhazeJump 688ba04192 outlet injector fix
hell if I know what it does, it was on the wrong layer SOMEHOW
2023-06-08 11:58:46 +02:00
PhazeJump 3822abe8ef fixed air injector
now it's ACTUALLY on layer 3
2023-05-31 18:40:25 +02:00
PhazeJump acfe0fe6cd Added VHS's map to rotation (I think)
this should be working now
If the map doesn't spawn, who ya gonna call?
BUGBUSTERS!
eh, tested it and it's gud. something fucks up, I'll fix it
2023-05-31 18:10:58 +02:00
PhazeJump 095f68e460 edited the whole fucking base
for this whole fucking thing to work correctly I had to increase the spawn rate for /obj/effect/mob_spawn/human/lavaland_syndicate/comms/space to 100% because otherwise it would have a 1% of the base to spawn with two spaces for ghosts, and 19% to spawn with any space for ghosts.

I also had to edit the non-modular map because it also is able to spawn in space and it would be the old one. I have also added listeningstation.dmm.old in non-modular, and syndielistenspace.dmm.old in modular to have the original one still in the files so that it can be easily rolled back to, if the need arises.
2023-05-10 01:49:15 +02:00
Comicao1 e9b6fc8ff5 Go on 2023-04-02 20:06:45 -03:00
Comicao1 6bdd504447 asd 2023-04-02 11:59:59 -03:00
Comicao1 d25175edb2 Done 2023-04-02 11:56:09 -03:00
Comicao1 f2c79712a3 Merge remote-tracking branch 'upstream/master' into xenoarch-new 2023-03-23 15:45:55 -03:00
Comicao1 44f8522120 Requested 2023-03-22 17:34:10 -03:00
KeplerWasTaken f6352383d5 Lavaland syndicate base now has a regular RD Console Board so they can sync their technologies via the protolathe 2023-03-12 11:59:47 +01:00
BongaTheProto 21c3abdfb7 Merge remote-tracking branch 'upstream/master' 2023-01-18 04:20:45 -05:00
SandPoot e76ed6a1ea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-17 22:26:56 -03:00
dapnee 5251c14f65 Letting that sink in
idk why this was never fixed
2023-01-13 16:59:27 -07:00
BongaTheProtoandGitHub 27c4b9113d Merge pull request #547 from KathrinBailey/mapping2
New Boxstation random engines!
2022-10-30 11:25:03 -05:00
BongaTheProtoandGitHub 4a4f4aaa54 Merge branch 'Sandstorm-Station:master' into master 2022-10-18 23:18:56 -05:00
SandPoot 1607d9ead8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-19 00:54:33 -03:00
KathrinBailey 35a2cfd959 Additional wallmounts and piping
Moves some piping out of the DIY zone on the SM map because piping space is valuable.
2022-10-16 23:31:02 +01:00
KathrinBailey 9d15297966 boxstation engines
two new engines:
diy - blank canvas to build your own stuff
diy_sm - an empty room with a crystal in it, make your own chamber!!

config changes
2022-10-16 23:06:38 +01:00
deathride58andGitHub ba8af5114e Merge pull request #15861 from shellspeed1/random-whiteship
Ports random whiteships from tg
2022-10-16 13:07:07 -04: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
shellspeed1 dfddbc23c3 ports https://github.com/tgstation/tgstation/pull/53603 Credit to TiviPlus 2022-09-22 01:10:08 -07:00
shellspeed1 95a775edf1 woopsie I forgot map stuff 2022-09-18 23:04:29 -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
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
BongaTheProto 2465f96728 Update spacehotel.dmm 2022-09-03 16:21:37 -05:00
BongaTheProto 3a0b41deb7 Merge branch 'pr/460' 2022-08-30 10:08:15 -05:00
Mannybrado 9f4676968f Update spacehotel.dmm 2022-08-28 13:48:10 -04:00
Mannybrado 3f9f89e741 Update lavaland_biodome_beach.dmm 2022-08-28 00:11:31 -04:00
Mannybrado 245ef2f5c7 Update lavaland_biodome_beach.dmm 2022-08-27 05:26:34 -04:00
Mannybrado 71f373e798 sex 2022-08-27 05:18:13 -04:00
Toxici11iandGitHub 5bb087806c Adds plant boxes! 2022-05-16 14:33:36 +01:00
Toxici11i 9bbfd5aae3 Fixes Syndiebase having incorrect typepaths. 2022-05-16 13:49:44 +01:00
BongaTheProto 6bb5419eeb wahooo
its a lotta stuff
2022-04-19 18:42:07 -05:00
nullfag 4fbbde788a more apc fucks 2022-04-17 00:44:16 +02:00
BongaTheProto d6225df65d Update lavaland_surface_syndicate_base1.dmm 2022-04-11 18:23:07 -05:00
BongaTheProtoandGitHub 0ee13a1cb0 Merge pull request #279 from NatSCP/Syndiebase
Syndie base shit
2022-04-09 13:08:06 -05:00
BongaTheProto a4fac709c3 Merge remote-tracking branch 'upstream/master' 2022-04-09 11:43:45 -05:00
SandPoot ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00
siliconsandGitHub dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
NatSCP 132f571b2c Update stupid little base
amogus
2022-04-08 20:24:40 -04:00
BongaTheProto b601e94958 Merge remote-tracking branch 'upstream/master' 2022-03-31 00:14:54 -05:00
SandPoot 282941ca5b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-31 00:21:11 -03:00
TripleShades af197ce22e lizard man points local mapper at the debug tools
local mapper goes FUCKING BONKERS
2022-03-29 02:12:32 -04:00