LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
LetterJay
7ea6eeb64e
GUHRILLAZ
2017-08-28 10:23:11 -05:00
LetterJay
defab9c7fc
Merge branch 'master' into upstream-merge-29923
2017-08-28 09:19:44 -05:00
LetterJay
739d5c70a7
Update meat.dm
2017-08-28 09:17:14 -05:00
LetterJay
27750d91d6
Merge pull request #2529 from Citadel-Station-13/upstream-merge-30214
...
[MIRROR] Removes the suppose-to-be unused shuttle wall path
2017-08-28 09:01:47 -05:00
LetterJay
792c509827
Merge pull request #2526 from Citadel-Station-13/upstream-merge-30200
...
[MIRROR] Fixes survival_pods being a valid_territory for gangs sprays & dominations/blob takeovers/cult summons/ect
2017-08-28 09:01:06 -05:00
LetterJay
b3c70bf024
Merge pull request #2525 from Citadel-Station-13/upstream-merge-30204
...
[MIRROR] Fixes APC pixel shift being off
2017-08-28 09:00:46 -05:00
LetterJay
47aa97b847
Merge pull request #2523 from Citadel-Station-13/upstream-merge-30207
...
[MIRROR] Adds separate log for sql errors with no config check
2017-08-28 09:00:19 -05:00
LetterJay
db56781717
Merge pull request #2522 from Citadel-Station-13/upstream-merge-30222
...
[MIRROR] Fixes surplus log icons.
2017-08-28 08:58:06 -05:00
LetterJay
e34367c41b
Merge pull request #2521 from Citadel-Station-13/upstream-merge-30225
...
[MIRROR] Switched dirtystation to use typecaches for checks
2017-08-28 08:57:52 -05:00
LetterJay
3a8cf01e65
Merge pull request #2520 from Citadel-Station-13/upstream-merge-30231
...
[MIRROR] Adds logging cause of microbomb activation in admin logs
2017-08-28 08:57:36 -05:00
LetterJay
4b1887ce12
Merge pull request #2519 from Citadel-Station-13/upstream-merge-30228
...
[MIRROR] file2list passes the file thru trim()
2017-08-28 08:57:19 -05:00
LetterJay
03a26e6468
Merge pull request #2518 from Citadel-Station-13/kevinz000-patch-5
...
absolute pathing for mammals
2017-08-28 08:56:55 -05:00
LetterJay
02ba44a8eb
Merge pull request #2505 from Citadel-Station-13/upstream-merge-30169
...
[MIRROR] Allows disabling shuttle purchases per map.
2017-08-28 08:56:33 -05:00
LetterJay
a17ed054d6
Merge pull request #2503 from Citadel-Station-13/upstream-merge-30172
...
[MIRROR] Maintains that weird entire-tcomms-setup-in-one-machine thing
2017-08-28 08:56:11 -05:00
LetterJay
29de038837
Merge pull request #2498 from Citadel-Station-13/upstream-merge-30162
...
[MIRROR] Gives plasmamen hallucinations when taking blackpowder
2017-08-28 08:54:01 -05:00
LetterJay
2fe2912fa3
Merge pull request #2496 from Citadel-Station-13/upstream-merge-30173
...
[MIRROR] Traitor, a traitor is a traitor.
2017-08-28 08:46:53 -05:00
LetterJay
c043b8a1d5
Merge pull request #2495 from Citadel-Station-13/upstream-merge-30182
...
[MIRROR] Holoparasite prompts now have a "Never For This Round" option
2017-08-28 08:46:19 -05:00
LetterJay
7474aa3edb
Merge pull request #2492 from Citadel-Station-13/upstream-merge-30191
...
[MIRROR] Fixes empty adminhelp tickets messages
2017-08-28 08:45:49 -05:00
LetterJay
5225aa7d65
Merge pull request #2493 from Citadel-Station-13/upstream-merge-30192
...
[MIRROR] Adds volume control to admin-played sounds
2017-08-28 08:45:34 -05:00
LetterJay
1457e388c2
Merge pull request #2494 from Citadel-Station-13/upstream-merge-30183
...
[MIRROR] Small devil fixes.
2017-08-28 08:45:16 -05:00
CitadelStationBot
12ff0e7406
Removes the suppose-to-be unused shuttle wall path
2017-08-28 02:20:45 -05:00
CitadelStationBot
2d4bd6f6f0
Fixes survival_pods being a valid_territory for gangs sprays & dominations/blob takeovers/cult summons/ect
2017-08-28 02:20:30 -05:00
CitadelStationBot
4a456fd2c7
Fixes APC pixel shift being off
2017-08-28 02:20:25 -05:00
CitadelStationBot
ed1a06a9ed
Adds separate log for sql errors with no config check
2017-08-28 02:20:16 -05:00
CitadelStationBot
993b452729
Fixes surplus log icons.
2017-08-28 02:20:11 -05:00
CitadelStationBot
0a4efdcc8f
Switched dirtystation to use typecaches for checks
2017-08-28 02:20:06 -05:00
CitadelStationBot
bdf2fff8d9
Adds logging cause of microbomb activation in admin logs
2017-08-28 02:19:59 -05:00
CitadelStationBot
7d15048221
file2list passes the file thru trim()
2017-08-28 02:19:54 -05:00
kevinz000
5ebf1c4b6b
Update furrypeople.dm
2017-08-27 19:48:29 -07:00
CitadelStationBot
349bd03b73
Adds periods to larva roars ( #2512 )
2017-08-27 06:42:16 -07:00
CitadelStationBot
94429bdccc
Cleaned up environment_smash vars with bitflag defines ( #2515 )
2017-08-27 05:55:07 -07:00
ktccd
985ea0d768
Sets all food prefs to NONE ( #2517 )
...
People can RP their food likes/dislikes. This stuff, like deciding what
is/isn't edible to slimes and such is unasked for and unecessary.
Also, they didn't address that this stealth-nerfs non-humans as
donk-pockets and such food items were put in a lot of places, expecting
to be used for healing, but can now not be eaten by, for example,
lizards.
2017-08-27 05:54:48 -07:00
ktccd
cdfa4148b4
Makes genitals_use_skintone save ( #2514 )
...
Adds a hook or whatever for it to save the setting.
Now, granted, with my previous PR this is probably pointless since
humans got custom colours now...
But it's good practice, you know? In case we revert the other PR and
all.
2017-08-27 04:22:04 -07:00
kevinz000
68f463452e
Revert "Lets humans use MUTCOLORs [Maximum Heresy]" - turns out this is breaking things ( #2516 )
...
fine ktccd il do it
2017-08-27 04:21:29 -07:00
CitadelStationBot
4c4bd22578
[MIRROR] Some more tweaks to Geis ( #2487 )
...
fixes clockcult conversion being :b:roken, as well as some geis tweaks that you won't care about
2017-08-27 01:36:17 -07:00
ktccd
e6114f7840
Makes humans use MUTCOLORS ( #2513 )
...
Exactly what it sounds like. Enables humans to use mutant colours and
disables the preset skintones.
Preset skintones are still doable, since mutant colours can be
accurately adjusted by putting in RGB values for the colours, but it'd
be more manual work. On the other hand, you can now get a more accurate
skin tone...
2017-08-27 00:58:50 -07:00
CitadelStationBot
66f046fe87
Fixes timestop spell ( #2506 )
2017-08-26 19:49:16 -07:00
CitadelStationBot
14ceaa39b4
Fixes component dupe checks not actually checking if there IS a dupe component ( #2501 )
2017-08-26 19:11:03 -07:00
kevinz000
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
CitadelStationBot
94400c4d38
Allows disabling shuttle purchases per map.
2017-08-26 11:08:12 -05:00
CitadelStationBot
18904f2f0f
Maintains that weird entire-tcomms-setup-in-one-machine thing
2017-08-26 11:08:01 -05:00
CitadelStationBot
b151209160
Gives plasmamen hallucinations when taking blackpowder
2017-08-26 11:07:33 -05:00
CitadelStationBot
3a6a277f08
Traitor, a traitor is a traitor.
2017-08-26 11:07:24 -05:00
CitadelStationBot
d38580afcd
Holoparasite prompts now have a "Never For This Round" option
2017-08-26 11:07:20 -05:00
CitadelStationBot
e9180afe0a
Small devil fixes.
2017-08-26 11:07:16 -05:00
CitadelStationBot
f21f2c8207
Adds volume control to admin-played sounds
2017-08-26 11:07:11 -05:00
CitadelStationBot
8be784e667
Fixes empty adminhelp tickets messages
2017-08-26 11:07:06 -05:00
kevinz000
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
