Commit Graph

18905 Commits

Author SHA1 Message Date
nik707
06f3ad7bb9 Merge pull request #7739 from Tupinambis/PubbyHotFix
[PRIORITY] Pubby Station Air Injector Hotfix
2018-11-18 17:16:43 -06:00
Tupinambis
e45fde5fa0 Ensures the air injectors in toxins and more importantly the SM engine actually function. 2018-11-18 17:01:16 -06:00
deathride58
a7cf00263b Merge pull request #7697 from Trilbyspaceclone/patch-7
[Ready]Roboticist Headset in there vendor for a coin
2018-11-18 07:50:22 -05:00
deathride58
e0cdd8fb93 Merge pull request #7678 from Trilbyspaceclone/patch-5
[Ready] Nerfs reactive armor a bit.
2018-11-18 07:42:42 -05:00
deathride58
500f068fe5 Merge pull request #7645 from Trilbyspaceclone/Tecweb_reblance
[Ready] Re-balance Tech Web nodes and points
2018-11-18 07:41:39 -05:00
deathride58
29bdaf3011 Merge pull request #7710 from Trilbyspaceclone/patch-8
[Grammar] [Ready] Makes Space Queens men pirate gear have better item descriptions
2018-11-18 07:39:14 -05:00
CitadelStationBot
23d83cd227 Automatic changelog generation for PR #7721 [ci skip] 2018-11-18 06:38:39 -06:00
deathride58
90776bc4c9 Merge pull request #7721 from Tupinambis/Oldstation
Oldstation but it doesn't lag the server.
2018-11-18 07:38:37 -05:00
deathride58
c82abfb5a9 Merge pull request #7732 from Citadel-Station-13/kevinz000-patch-18
Cult deconversion now properly removes the blood halo
2018-11-18 07:38:22 -05:00
CitadelStationBot
ef9ec4db88 Automatic changelog generation for PR #7733 [ci skip] 2018-11-18 06:38:13 -06:00
deathride58
6166263396 Merge pull request #7733 from R3dtail/patch-1
Update chat_commands.dm
2018-11-18 07:38:10 -05:00
Trilbyspaceclone
5feebdc7d3 "Better Grammar or something" 2018-11-18 06:10:23 -05:00
Tupinambis
338a98972f Makes the ruin more of a challenge. 2018-11-16 22:34:34 -06:00
CitadelStationBot
e704840457 Automatic changelog generation for PR #7717 [ci skip] 2018-11-16 22:32:27 -06:00
deathride58
005d4d45a8 Merge pull request #7717 from Tupinambis/PubbySM
Pubby Engineering has been redesigned with a SM engine.
2018-11-16 23:32:25 -05:00
deathride58
a870de6b81 Merge pull request #7725 from Citadel-Station-13/kevinz000-patch-17
slows down monkies woops my bad
2018-11-16 23:22:03 -05:00
deathride58
660bb679af Merge pull request #7716 from Citadel-Station-13/kevinz000-patch-7
cuts glowshroom maximum structural health by 7
2018-11-16 23:20:16 -05:00
CitadelStationBot
e76cb58143 Automatic changelog generation for PR #7714 [ci skip] 2018-11-16 22:19:56 -06:00
deathride58
725f1c822c Merge pull request #7714 from Tupinambis/LoneOperative
Lone Ops but they are an actual threat (hopefully)
2018-11-16 23:19:54 -05:00
deathride58
7c3d975513 Merge pull request #7713 from Citadel-Station-13/kevinz000-patch-11
Fixes despacito command
2018-11-16 23:19:11 -05:00
CitadelStationBot
f364d13a34 Automatic changelog generation for PR #7712 [ci skip] 2018-11-16 22:18:57 -06:00
deathride58
fad25aed57 Merge pull request #7712 from Tupinambis/SyndicateShuttle
Adds an emag exclusive syndicate emergency shuttle.
2018-11-16 23:18:55 -05:00
deathride58
d5de7f3947 Merge pull request #7711 from Citadel-Station-13/kevinz000-patch-9
Adds automatic pruning of GLOB.player_list (mute bug autofix)
2018-11-16 23:18:22 -05:00
CitadelStationBot
d1b9dc2e08 Automatic changelog generation for PR #7719 [ci skip] 2018-11-16 16:56:44 -06:00
deathride58
1abeb42675 Reduces shadow species light threshold leniency to accommodate for cit lighting changes (#7719) 2018-11-16 14:56:42 -08:00
CitadelStationBot
b12e5873c6 Automatic changelog generation for PR #7731 [ci skip] 2018-11-16 16:54:56 -06:00
deathride58
f04c7775e0 Adds the ability to choose plural and neuter genders (labelled "non-binary" and "object", respectively) (#7731)
* Allows choosing neuter and plural gender options (labelled ingame as "object" and "non-binary" respectively)

* tfw the code argues fuckin semantics with you
2018-11-16 14:54:55 -08:00
CitadelStationBot
43b99740c5 Automatic changelog generation for PR #7730 [ci skip] 2018-11-16 16:54:35 -06:00
deathride58
4d7a45ba41 reduces the revolution round end grace period to 10 minutes (#7730) 2018-11-16 14:54:33 -08:00
CitadelStationBot
728da8abe1 Automatic changelog generation for PR #7726 [ci skip] 2018-11-16 16:47:44 -06:00
deathride58
402a5ba9e4 Makes it plausible to join as ghost roles from the latejoin menu (#7726)
* Makes it plausible to join as ghost roles from the latejoin menu

* Clarifies a little bit of the text
2018-11-16 14:47:42 -08:00
CitadelStationBot
464d759701 Automatic changelog generation for PR #7723 [ci skip] 2018-11-16 16:46:57 -06:00
deathride58
f385751c4a Brings back nonlethal 38 bullets in a semi-nerfed state, keeps the current lethal variant in as a brand new sec autolathe printable ammo box (#7723)
* Brings back nonlethal 38 bullets in a semi-nerfed state, adds lethal variant for the c38 bullet available at autolathes

* Im drunk ignore me
2018-11-16 14:46:54 -08:00
CitadelStationBot
b3747aa73b Automatic changelog generation for PR #7727 [ci skip] 2018-11-16 16:46:35 -06:00
deathride58
ebaf5ab6a1 Makes the eyeblur effect scale depending on how much eyeblur you have (#7727) 2018-11-16 14:46:33 -08:00
CitadelStationBot
a01341d358 Automatic changelog generation for PR #7729 [ci skip] 2018-11-16 16:46:15 -06:00
deathride58
af68012d7d makes teleporters viable - increases the range of all launchpads across the board (#7729) 2018-11-16 14:46:13 -08:00
kevinz000
9f2b1b9d1a Update cult.dm 2018-11-16 14:42:31 -08:00
R3dtail
17e1198242 Update chat_commands.dm
I was challenged to make Citadelbot great, and I did my best.
2018-11-16 14:58:27 -06:00
kevinz000
62514114ec Update monkey.dm 2018-11-15 22:17:02 -08:00
Tupinambis
bfe8fda260 Makes hivebots more robust. Makes oldstation not have an excessive amount of hivebots. 2018-11-15 20:25:06 -06:00
Tupinambis
addda0398f Tesla died for our sins. 2018-11-11 20:04:22 -06:00
kevinz000
14e654ac45 Update glowshroom.dm 2018-11-11 17:28:11 -08:00
deathride58
11acee20e2 Merge pull request #7706 from Citadel-Station-13/kevinz000-patch-7
Fixes the last hard sync nuking the beam rifle nerfs. 160/60 impact/AOE damage reduced to 96/39. Regular blob tiles have 40 health.
2018-11-11 02:33:23 -05:00
deathride58
98b5bb1d5e Merge pull request #7707 from Poojawa/laziness-never-pays-off-take-note-bhjin
Actually test-fixed taur suits this time
2018-11-11 02:32:46 -05:00
Tupinambis
cc1b65f810 Lone ops now spawn without a bulldog and with a syndie softsuit rather than a hardsuit. 2018-11-10 19:29:15 -06:00
kevinz000
f63d890a75 Update chat_commands.dm 2018-11-10 15:23:11 -08:00
Tupinambis
a3678b0713 Adds an emag exclusive syndicate emergency shuttle. 2018-11-10 15:33:01 -06:00
kevinz000
82c2a74980 Update server_maint.dm 2018-11-10 11:51:14 -08:00
Trilbyspaceclone
6694add91e ''honorable'' 2018-11-10 12:43:20 -05:00