Commit Graph

208 Commits

Author SHA1 Message Date
kevinz000 9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54
ports in the Hilbert's Hotel.
2019-10-24 19:07:33 -07:00
kevinz000 d5041b7dde Merge pull request #9582 from Putnam3145/dynamic-config
Adding dynamic rules to the game config
2019-10-24 18:55:29 -07:00
Putnam 67662d1d69 everything works now 2019-10-22 21:39:28 -07:00
Putnam 8c892a5560 whoops forgot this important change. 2019-10-22 20:10:45 -07:00
Putnam bc79aeb541 Added configs to options properly. 2019-10-22 19:54:35 -07:00
Putnam bacc875524 added actual game configs to all the dynamic modes 2019-10-22 19:12:54 -07:00
kevinz000 9e63413911 Merge pull request #9466 from deathride58/yawnborgs
Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert)
2019-10-21 01:04:34 -07:00
kevinz000 62e11c79b4 Merge pull request #9403 from Poojawa/patch-3
Updates Config with Citadel specific links & info
2019-10-11 12:11:19 -07:00
deathride58 60749f8b07 Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert) 2019-10-11 14:33:32 -04:00
Ghommie 31a6979c3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-10-06 21:54:15 +02:00
Ghommie 3d22f4ec60 Porting a load of disease/symptoms code updates. 2019-10-05 07:14:25 +02:00
Poojawa 81b4a994e0 Updates Config with Citadel specific links & info
To be used with the in-game button redirections
2019-10-03 18:19:24 -05:00
Poojawa 94afbbd560 Adding Horn colors, multiple-select legs, and species squash
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking.  Sprites tweaked on a bunch of critters. Added new wings....
2019-09-11 17:46:17 -05:00
Ghommie f843a53fe9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-08-24 12:52:16 +02:00
kevinz000 fb2971e3e6 Merge remote-tracking branch 'origin/master' into donator_grouping 2019-08-15 14:40:44 -07:00
Ghommie 23e3263fcb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-08-08 04:46:54 +02:00
kevinz000 277971971f s 2019-08-07 13:07:38 -07:00
Thalpy 5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
Seris02 59f45d3e35 adds abductor replication lab with advanced tools 2019-07-15 15:18:04 +08:00
Ghommie 28d3747c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-06-24 16:55:10 +02:00
Fermi 10109d0fe5 Merge branch 'pr/18' 2019-06-23 19:15:07 +01:00
Thalpy 41eee65b15 Merge branch 'master' into master 2019-06-17 12:18:40 +01:00
BlackMajor 1060bb05b4 Space hermit ruin 2019-06-17 17:41:46 +12:00
Ghommie ba3a2c00bb ports in the Hilbert's Hotel. 2019-06-16 10:50:59 +02:00
BlackMajor 9219a2c813 Adding more ruins 2019-06-15 21:17:34 +12:00
BlackMajor 4528384976 Fuck it lets add way more spiciest PR 2019-06-15 19:03:04 +12:00
BlackMajor e2ad96f4c9 Made a shitty space ruin robotics lab 2019-06-12 01:21:16 +12:00
Fermi 336ba8dbad Tidying code. 2019-05-29 02:33:15 +01:00
Thalpy 5287f3f9c7 Merge branch 'master' into pr/7 2019-05-10 02:20:19 +01:00
Thalpy b21599a151 Don't overwrite admins 2019-04-24 17:35:07 +01:00
Fermi 390f9a635f Error message addition. 2019-04-16 23:03:24 +01:00
Poojawa ebc9c6d8f0 attempts to make slime sprites equally transparent
also gives them snouts and markings for improvments
2019-04-04 22:01:52 -05:00
Tupinambis e5e97302d4 Adds a new security level: Amber (#7976)
* Adds the Amber security level.

* This isn't C
2019-02-05 17:53:58 -08:00
deathride58 104a3406a0 Makes the server tagline a config option 2019-01-08 16:19:12 -05:00
deathride58 a93751bc03 adds the ability to actually vote for maps instead of using tg's biased preference-based voting system (#7743) 2018-11-19 20:10:25 -08:00
Tupinambis a3678b0713 Adds an emag exclusive syndicate emergency shuttle. 2018-11-10 15:33:01 -06:00
deathride58 cbc21fe8db okay, let's watch the population drop - adds a config option that makes all stamina buffer actions free (TG-style gameplay) (#7608)
* "sTAM BAD REE" is like sandpaper on my nerves. so let's turn the server into a TG clone for a week and watch as the population dwindles to nothing just to prove a point!

* and the config, too
2018-11-09 19:10:20 -08:00
deathride58 50c604acc5 might as well since the pr touches this file 2018-11-06 02:07:14 -05:00
Bear c6ce774327 what a gas 2018-11-01 22:35:18 -04:00
LetterJay 344c09644e Merge pull request #7530 from Citadel-Station-13/updatestitlescreenreadme
updates the title screen config readme to account for the 7:5 lobby
2018-10-03 22:30:43 -05:00
Poojawa bc0d14c193 Continual updates until merged 2018-09-17 04:55:03 -05:00
Poojawa 62813d4392 Fixes Preference related issues
Also fixes headpatting & tail checks in general
2018-09-14 03:06:21 -05:00
Poojawa 235bbae157 ports BSQL to go along with tools
There, now you can shut up about it not being ported you meme
2018-09-05 23:45:53 -05:00
deathride58 892b73e9c6 updates the title screen config dir to account for the 7:5 lobby 2018-09-02 02:41:01 -04:00
Tupinambis 02a86dd2a0 New Alien Lavaland Ruin (#7455)
* Removes the old "xeno nest" lavaland ruin that currently is blacklisted on the live server, and replaces it with a new "alien nest" ruin.

* Tiny ruin description change.

* Removed all organs scattered around the nest, and replaced them with corpses you must harvest the organs from. Also slightly changes the loot and the locations of said loot.

Drone and Queen corpse spawners have been added.

* Removed xenomorph queen corpse, moved drone corpse into a location that is harder to cheese. Added "Hive's Blessing" (Syringe containing alien microbes.)
2018-08-23 00:26:32 -07:00
kevinz000 2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58 65e2d7695b Merge pull request #7152 from LetterN/patch-3
removes extra circuit config
2018-07-06 01:42:38 -04:00
CitrusGender d50ae43d7f Fixed cyborgs not getting their names at round start 2018-06-24 13:55:03 -05:00
Letter N 0bd2d9e6fe Update game_options.txt 2018-06-18 14:58:13 +08:00
deathride58 b3b9a44689 Merge branch 'master' into upstream-merge-38165 2018-06-05 21:53:14 +00:00