Commit Graph

17225 Commits

Author SHA1 Message Date
Putnam
36d860a4ba Makes from-ghosts ruleset cancel if fewer than required candidates 2019-11-19 20:10:06 -08:00
Ghommie
b78da82336 Honkbot slip and slide fun ride. 2019-11-20 04:03:57 +01:00
Ghommie
7c0c14e059 Fixing aux-base construction RCD door access settings menu and reverting another non-functional bit 2019-11-20 03:35:06 +01:00
Knouli
592c952d64 Update regenerative_core.dm 2019-11-19 20:03:04 -05:00
Ghommie
13f65c028f Moves some clockie paper info to the right file. 2019-11-20 01:19:05 +01:00
Hatterhat
f161b01f6b ayytech plants 2019-11-19 17:26:44 -06:00
Ghommie
c21a137a62 Fixes super-lube waterflower. 2019-11-19 22:56:29 +01:00
kevinz000
95b9dd61a8 Update game_mode.dm 2019-11-19 13:01:06 -07:00
deathride58
cb70f47a48 Merge pull request #9814 from Citadel-Station-13/kevinz000-patch-115
modifies donator config entry to allow multiple ckeys per line
2019-11-19 13:38:20 -05:00
Useroth
5169205a19 Added a 10pack as well 2019-11-19 19:35:37 +01:00
Ghommie
21f15e411d Part 3 2019-11-19 19:34:42 +01:00
Useroth
24bd42fc80 Adds strange seeds as a buyable traitor botanist item. 2019-11-19 19:19:40 +01:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Thalpy
20fa223fc4 Oop 2019-11-19 16:46:59 +00:00
Thalpy
3abae989df Final settings 2019-11-19 16:44:10 +00:00
Thalpy
bf89df7e7b Fixing things 2019-11-19 16:03:33 +00:00
Useroth
6e2ff6ce3c Prevents storage bags from re-ordering their contents when items are removed. 2019-11-19 16:13:57 +01:00
Thalpy
c0287cf7b5 Reagent sleepers! 2019-11-19 14:50:22 +00:00
Thalpy
2eb33afcd6 Workin 2019-11-19 14:19:51 +00:00
Fermi
9fb6c2f3a3 Okay I gotta hop 2019-11-19 12:22:53 +00:00
Knouli
a6d4e7edef Update regenerative_core.dm 2019-11-19 06:00:56 -05:00
BlackMajor
1b1ed21f42 No adrenals for borgs please 2019-11-19 22:13:22 +13:00
kevinz000
2494ea4d07 Merge pull request #9824 from YakumoChen/YakumoChen-mariplush
Adds Marisa plushie
2019-11-19 01:55:59 -07:00
kevinz000
40a01dedfe Merge pull request #9806 from BlackMajor/Yote
Borg changes. Compresses Service/Janitor/Scrubpuppy borgs together. Removes borgi. Adds vore sleepers to service and engi dogborgs. Demodularizes some dogborg stuff too.
2019-11-19 01:54:47 -07:00
BlackMajor
6cdb54bef1 Fix service borg lights breaking 2019-11-19 21:29:05 +13:00
kevinz000
84e84355c3 Update code/controllers/configuration/config_entry.dm
Co-Authored-By: Lin <linzolle@gmail.com>
2019-11-19 01:07:43 -07:00
BlackMajor
31c59b7cad fixes upgrades removing dogborg stuff 2019-11-19 20:50:59 +13:00
Lin
c188c20f37 Merge pull request #9802 from Ghommie/Ghommie-cit349
Unmodularize bikehorns and holy weapons.
2019-11-19 03:24:38 +00:00
Lin
512939f1e6 Merge pull request #9730 from Citadel-Station-13/kevinz000-patch-112
kinetic crushers no longer drop if you try to use it with one hand
2019-11-19 03:23:12 +00:00
Ghommie
a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Ghommie
63a3919ed2 Fixing gasping xenos. 2019-11-18 20:58:22 +01:00
Ghommie
21c1f8bc2a Fixing suit store overlays 2019-11-18 15:19:39 +01:00
Trilbyspaceclone
b64b039709 correctes commits 2019-11-18 06:30:47 -05:00
Trilbyspaceclone
d90812b0b2 reverts rapier nerfs 2019-11-18 06:26:25 -05:00
Ghommie
86072fe682 " 2019-11-18 04:15:33 +01:00
Ghommie
deadffe96f missing parenthesis. 2019-11-18 03:26:04 +01:00
Ghommie
1c39a3bc6d Adds a few extra cardboard cutout variants. 2019-11-18 03:23:24 +01:00
Ghommie
ec4e3898eb Fixing some wizard den teleportation issues. 2019-11-18 02:04:49 +01:00
Ghommie
bd41cfbfc5 fixing a few minor issues with console frames building. 2019-11-17 22:44:37 +01:00
Trilbyspaceclone
c575b3c798 base ball bats, katanan's and chainsaws will still fit 2019-11-17 13:54:18 -05:00
Trilbyspaceclone
7780a14a60 rapier huge 2019-11-17 13:49:32 -05:00
Anonymous
b714c32ca2 Partly Reverts "Fixes loadout name, adds DAB outf-
it crate to cargo"

This reverts commit 1bb8ff1c0c.
Removes cargo changes.

In other news, I can't please everyone and I hate society,
thank you for coming to my TED Talk.
2019-11-17 19:44:22 +03:00
NopemanMcHalt
8f7571a115 Don't do webedits, folks
I mean seriously it's quick but there's chance of fucking up something
2019-11-17 18:18:20 +03:00
Seris02
468b6eb609 mining winter coat shtuff
- adds the mining winter coat to mining wardrobes and mining lockers
2019-11-17 22:27:09 +08:00
KathrinBailey
05c74c731b Ports TG pew files 2019-11-17 14:20:44 +00:00
Putnam
ba091b3a27 limited midround wizard summon events possibilities 2019-11-17 05:56:19 -08:00
Anonymous
1bb8ff1c0c Fixes loadout name, adds DAB outfit crate to cargo
For "recruitment" on-station.
2019-11-17 15:08:30 +03:00
Seris02
dea5019bc9 cosmic winter coat yeeeehaw 2019-11-17 20:06:01 +08:00
Seris02
86a576e644 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix 2019-11-17 15:45:35 +08:00
Seris02
7d99508bd0 adds janitor winter coat 2019-11-17 15:45:12 +08:00