7549fb09fa
Merge pull request #2416
2017-08-29 22:27:19 -07:00
25e1a78b51
Merge pull request #2407
2017-08-29 22:27:13 -07:00
5c7b743cfa
Merge pull request #2405
2017-08-29 22:27:10 -07:00
5dc670e282
Merge pull request #2401
2017-08-29 22:27:07 -07:00
fcddd32703
Merge pull request #2195
2017-08-29 22:26:58 -07:00
41c1f939ab
gdi
2017-08-29 20:21:41 -07:00
92a2ac0ae3
soft sync
2017-08-29 20:20:11 -07:00
17f3ce92b6
Merge branch 'master' into upstream-merge-29960
2017-08-29 20:14:22 -07:00
bf5d1fc159
sync
2017-08-29 20:14:08 -07:00
0970653382
adds missing var preventing guilmon bodymarkings from being displayed
2017-08-29 21:26:50 -05:00
b2114a7b81
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-08-29 21:19:22 -05:00
301a581e64
sync
2017-08-29 09:41:11 -07:00
064ade469f
sync
2017-08-29 09:35:55 -07:00
88093698f2
sync
2017-08-29 09:33:37 -07:00
80221fa874
sync
2017-08-29 09:32:40 -07:00
498bd61928
sync
2017-08-29 09:12:56 -07:00
3fe08c3cc7
Prevents medbeams from crossing themselves
2017-08-29 09:50:47 -05:00
2ff65a8e39
[MIRROR] Lowers the chance for monkeys to become gorillas ( #2476 )
...
* Lowers the chance for monkeys to become gorillas
* Delete life.dm.rej
* Update life.dm
2017-08-29 00:59:34 -07:00
97bee315bf
Update living_defense.dm
2017-08-29 01:50:46 -05:00
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
7ea6eeb64e
GUHRILLAZ
2017-08-28 10:23:11 -05:00
defab9c7fc
Merge branch 'master' into upstream-merge-29923
2017-08-28 09:19:44 -05:00
739d5c70a7
Update meat.dm
2017-08-28 09:17:14 -05:00
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
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
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
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
03a26e6468
Merge pull request #2518 from Citadel-Station-13/kevinz000-patch-5
...
absolute pathing for mammals
2017-08-28 08:56:55 -05:00
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
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
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
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
12ff0e7406
Removes the suppose-to-be unused shuttle wall path
2017-08-28 02:20:45 -05:00
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
4a456fd2c7
Fixes APC pixel shift being off
2017-08-28 02:20:25 -05:00
993b452729
Fixes surplus log icons.
2017-08-28 02:20:11 -05:00
5ebf1c4b6b
Update furrypeople.dm
2017-08-27 19:48:29 -07:00
349bd03b73
Adds periods to larva roars ( #2512 )
2017-08-27 06:42:16 -07:00
94429bdccc
Cleaned up environment_smash vars with bitflag defines ( #2515 )
2017-08-27 05:55:07 -07:00
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
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
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
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
66f046fe87
Fixes timestop spell ( #2506 )
2017-08-26 19:49:16 -07:00
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
b151209160
Gives plasmamen hallucinations when taking blackpowder
2017-08-26 11:07:33 -05:00
d38580afcd
Holoparasite prompts now have a "Never For This Round" option
2017-08-26 11:07:20 -05:00
f21f2c8207
Adds volume control to admin-played sounds
2017-08-26 11:07:11 -05:00
8be784e667
Fixes empty adminhelp tickets messages
2017-08-26 11:07:06 -05:00
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
kevinz000