Commit Graph
272 Commits
Author SHA1 Message Date
BongaTheProtoandGitHub 2c795610e5 Merge pull request #1134 from Vhariik/Dum
Nerf of the miracle ruin
2024-04-25 17:57:23 -05:00
Vhariik 05e8fa8a96 Merge remote-tracking branch 'upstream/master' into Dum 2024-04-06 21:54:58 -03:00
Vhariik be56e81c94 re-adds pulse rifle, but with a kaiju pin 2024-04-06 21:50:43 -03:00
BongaTheProto dc057a41ad Merge branch 'master' into upstream-merge 2024-04-06 18:51:51 -05:00
Vhariik f472def10c nerfed the miracle 2024-04-03 22:58:21 -03:00
Elizabeth Lavenza 45ced4d926 Fix ashwalkers not being remade with the proper gender 2024-04-01 11:33:31 -04:00
BongaTheProto 493fa7f215 Merge branch 'master' into upstream-merge 2024-03-28 15:43:55 -05:00
ariaworld d13fd64e34 Update this! 2024-03-27 20:21:07 +01:00
BongaTheProto b2e14a5393 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-03-24 17:02:38 -05:00
SandPoot b76127c2d7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-03-15 19:21:39 -03:00
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
BongaTheProto d1b0e9ec9f Merge remote-tracking branch 'upstream/master' 2024-03-01 21:15:28 -05:00
ariaworld d23648c240 Safety update: avoid storing atmos components in infinidorm rooms 2024-01-25 21:53:29 +01:00
ariaworld 90cf0e467a Offset for tryActiveRoom 2024-01-21 23:09:37 +01:00
SandPootandGitHub 419f3b5ac8 Merge pull request #367 from DetectiveEnotsky/patch-1
Allows you to pick your character for certain ghost roles
2024-01-19 22:01:03 -03:00
ariaworld 71a3d2b8dc Tweak descriptions 2024-01-19 15:57:40 +01:00
SandPoot 2cefedd316 push 2024-01-16 16:54:53 -03:00
ariaworld ea6e17e636 Remove syndie apartment, tweak apartments, fix container contents deletion, remove empty dresser, smooth wooden wall with indestructible variant. 2024-01-14 23:42:23 +01:00
ariaworld 4b192acac8 Fix: remove fridges, move initial items out of containers, fix water overlays, new empty dressers 2024-01-14 19:16:43 +01:00
ariaworld 37b48d7c5d Fix light switches + sauna walls 2024-01-14 15:45:20 +01:00
ariaworld e78370e328 Fix list of rooms 2024-01-13 14:31:56 +01:00
ariaworld 73fe546cdd Fix: Apartment names 2024-01-13 14:23:00 +01:00
ariaworld bd5f3a8312 Fix: first infinidorm room not saving, items in containers being thrown out on re-visit. 2024-01-12 02:32:33 +01:00
ariaworld 5bdf891e10 Check for mystery room 2024-01-12 00:08:08 +01:00
ariaworld 6a639b1ccd Tweaks! 2024-01-11 22:33:46 +01:00
ariaworld f6f2001bcd Remove atmos pipes from hotel rooms, rework garden room, increase layer of siding decal 2024-01-11 02:04:42 +01:00
ariaworld 3b7eca634c Attempt 1 in Storing rooms 2024-01-10 15:48:50 +01:00
ariaworld b89d965f25 Uncomment code! 2024-01-10 01:55:56 +01:00
ariaworld 87a7f3addd Comment out storeRoom function 2024-01-09 22:10:22 +01:00
ariaworld 61b5128634 Important quickfix (check active room for room type input) 2024-01-08 17:23:37 +01:00
ariaworld 6c0cbb6115 Stops using tryStoredRoom because turfs can't be moved off the map 2024-01-07 23:20:31 +01:00
ariaworld 09dcd32751 Revert changes done to trystoredroom and storeroom functions 2024-01-07 20:19:21 +01:00
ariaworld 4863b89009 Infinidorms update! 2024-01-07 04:57:04 +01:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
BongaTheProto 1ba8d0f7f0 Merge branch 'pr/834' 2023-08-22 18:26:12 -05:00
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03: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
KeplerWasTaken e6dab1762a Removed die of fate from being acquirable through ic means 2023-03-28 23:21:37 +02:00
BongaTheProto 2dafbbd810 Update hilbertshotel.dm
Minor inconveninence
2022-06-16 16:31:54 -05:00
BongaTheProto 0fa825daec better mob handling 2022-06-16 03:07:08 -05:00
BongaTheProto ba6bb76258 maybe less lag?
limits the amount of infinidorms for good
2022-06-16 02:39:56 -05:00
BongaTheProto 6ada3f7c94 Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen 2022-04-18 21:36:14 -05:00
BongaTheProto a4fac709c3 Merge remote-tracking branch 'upstream/master' 2022-04-09 11:43:45 -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
LinandGitHub 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
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
Solaris-ShadeandGitHub 48db01702b Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-04-06 22:31:51 -04:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00