172 Commits
Author SHA1 Message Date
Mosley 0d9eebd20c Merge remote-tracking branch 'upstream/master' 2025-04-24 17:03:15 -05:00
SandPoot 2d87780147 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-02-13 18:06:56 -03:00
SandPoot 56d972eb0b all sorts of fixes and updates, may break stuff 2025-02-09 02:09:28 -03:00
SandPoot 76042510df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-01-28 19:21:39 -03:00
SandPoot cae94afdb7 push 2025-01-26 18:06:36 -03:00
ariaworld 93b1db7cfe + 2024-09-14 23:51:52 +02:00
ariaworld 67b519b070 Meow,, 2024-09-14 15:53:53 +02: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 676cb864b1 missed proc refs 2024-03-12 22:17:30 -03:00
BongaTheProto d1b0e9ec9f Merge remote-tracking branch 'upstream/master' 2024-03-01 21:15:28 -05: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
SandPoot 06af18b7db push 2024-01-19 20:18:26 -03:00
SandPoot 2cefedd316 push 2024-01-16 16:54:53 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
BongaTheProtoandGitHub d9d617bf8d Merge branch 'Sandstorm-Station:master' into master 2023-02-10 16:53:13 -05:00
SandPoot 5052f836e7 the stuff 2023-02-06 19:54:54 -03:00
AshTheDergandGitHub 635d1afc60 Fix for missing Hotel Staff outfit
Replaces the Telegram Outfit, which seems to be missing a sprite, with the Red Suit outfit. Temporary fix. Staff will now no longer be inappropriately nude.
2022-04-29 02:13:13 -04:00
AManWithAToolbox fc962c2680 update 2022-04-08 15:49:50 -05: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
dragonbird13 cc53f9aeb4 Slightly polishing ghostroles appearance loader, and only. Also polishing my map for more easily start (curse you miners) 2021-12-16 00:37:19 +05: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 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 13d7a166fe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-27 13:54:49 -03:00
Linzolle a4a72b1b16 make plasmemes not die in ghost cafe 2021-10-24 17:27:32 -07:00
SandPoot 45ef0fe5ca closes #15278 2021-10-17 21:40:39 -03: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
WanderingFox95andGitHub 9e9686c0cd Removing unused code altogether. 2021-07-21 19:42:58 +02:00
WanderingFox95andGitHub 36db1c1f87 Removes Recipe Limit 2021-07-20 19:00:29 +02:00
BlueWildroseandGitHub 911d8ffc12 requested changes 2021-04-18 18:02:04 -07:00
BlueWildroseandGitHub de6b3552d5 that grammar would make me mad if I left it there why did I do that 2021-04-05 22:59:24 -07:00
Blue Wildrose 80e9437390 add some game logging for good measure 2021-04-05 21:47:15 -07:00
Blue Wildrose fb79a2033d usr.name into user, also adding in do_after. 2021-04-04 21:34:27 -07:00
Blue Wildrose 414d9d43e3 adding a gap here 2021-04-04 18:50:11 -07:00
Blue Wildrose 43d855c413 Killable space pirate sleepers 2021-04-04 17:05:18 -07:00
siliconsandGitHub f269a8d35f Merge pull request #14274 from timothyteakettle/disguise
lets ghost cafe residents disguise themselves as any mob or object
2021-03-27 01:37:09 -06:00
Hatterhat dd44ebae46 peak funny 2021-03-17 16:10:32 -05:00
Timothy Teakettle b2015e4c94 blacklist 2021-02-21 17:32:07 +00:00
timothyteakettle deb1a5374d Update ghost_role_spawners.dm 2021-02-20 00:33:57 +00:00
timothyteakettle d34c821db4 Update ghost_role_spawners.dm 2021-02-19 23:45:01 +00:00
Timothy Teakettle a444918936 Update ghost_role_spawners.dm 2021-02-19 23:11:41 +00:00
Putnam 8a01b949bf Cleaned up SDGF and consistencised clones. 2020-09-29 03:47:09 -07:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00