Commit Graph
237 Commits
Author SHA1 Message Date
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
BongaTheProtoandGitHub f5af499eee Merge branch 'Sandstorm-Station:master' into master 2022-04-06 16:01:25 -05:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot 16fddbb140 Upload files 2022-03-18 18:35:29 -03:00
Solaris-Shade 2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
BongaTheProtoandGitHub 93016e7568 Merge branch 'Sandstorm-Station:master' into master 2022-02-16 16:03:32 -05:00
silicons ce6e8c99c6 fixes 2022-02-15 21:56:36 -07:00
BongaTheProto ffcca5c46b Merge remote-tracking branch 'upstream/master' 2022-02-08 01:16:02 -05:00
siliconsandGitHub af6e43c595 refactors clickcatchers/parallax/fullsceren (#15460)
* :)

* that

* move those there

* refactor that too

* wew

* stuff

* almost.

* sigh

* just need speed

* stuf

* pain

* hm

* tweaks

* that

* eh

* wack

* a

* done

* that's important

* wacky

* all that

* fixes

* typo

* that

* a

* funny

* that

* that

* woo

* help im losing my fucking mind

* okay

* fix
2022-02-07 15:17:24 -08:00
James ffe9a1c059 Fixes atom_movements.dm runtime
Players gets teleported before dorm room is loaded. Now we only teleport when the room is ready.
2022-02-05 08:59:21 +00:00
BongaTheProto f18f566e4d Merge remote-tracking branch 'upstream/master' 2022-02-04 00:16:28 -05:00
08b38a7e70 Ashwalker Update (#15466)
* Ashwalker Update

* Update generic_positive_events.dm

* Update ashwalker.dm

* fixing newlines

* Update code/modules/antagonists/_common/antag_datum.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* literally 1984

* unlimiting spawns

* Create antag_datum.dm.bak

* Revert "Create antag_datum.dm.bak"

This reverts commit d91e1f4c4d9c86bc4a275ef19f45e8927dd93cae.

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2022-02-03 19:34:15 -08:00
BongaTheProto e036e00701 made fix modular
:3
2022-01-21 03:33:11 -05:00
StrangeWeirdKitten 0d4006ffe3 Update hilbertshotel.dm 2022-01-21 01:19:25 -07:00
dragonbird13 a14b4dac51 Returning our own characters on ghostroles! (Ported from Hyper). Now have to add var canloadappearance = TRUE to every ghostrole spawners which allowed to spawn humanlikes 2021-12-04 03:09:00 +05:00
E 9d65426d85 fixes runtime 2021-11-29 16:54:54 +01:00
E cf757b84af more ashie shit 2021-11-18 23:18:24 +01:00
BongaTheProto 41c7851319 Revert "Revert "Merge pull request #3 from NullFag/ashies""
This reverts commit 6ad6a448aa.
2021-11-14 01:30:30 -05:00
BongaTheProto 6ad6a448aa Revert "Merge pull request #3 from NullFag/ashies"
This reverts commit 239442d1ba, reversing
changes made to 78e7e3b157.
2021-11-14 01:13:53 -05:00
E 7efba191d3 most of ashies' shit (w/o heat/ashen hair) 2021-11-14 04:35:13 +01:00
Letter NandGitHub bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
zerothebigboy e0a311435b thetwentysecondofmany 2021-06-11 20:53:35 -04:00
LetterN 292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
Letter N 935e46b492 The Mapping Update
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
siliconsandGitHub 596d0687d9 Update necropolis_gate.dm 2021-03-08 19:16:23 -07:00
siliconsandGitHub 66874fe252 Merge pull request #14083 from shellspeed1/alternative-xeno-hive
Removes the queen, and increases xeno variety in lavaland xenomorph ruin.
2021-01-20 15:22:06 -07:00
shellspeed1 c89341227c Adds more dead xeno subtypes for mapping 2021-01-17 18:01:24 -08:00
silicons ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
08d2b0bc17 Update code/modules/ruins/objects_and_mobs/sin_ruins.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-01-10 23:41:52 +00:00
timothyteakettle 99b26c08be Update sin_ruins.dm 2021-01-10 01:56:18 +00:00
Letter N a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
silicons 5b03f5b0ec more 2020-11-12 23:36:18 -07:00
19f1e99a8c mass ports like 15 tg prs + counting (#13386)
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-10-10 12:20:33 +02:00