cbf7ff0fc7
Dummies used for preference setup always compile overlays ( #31267 )
2017-10-04 11:03:47 -05:00
0515d2b754
Merge pull request #3110 from Citadel-Station-13/upstream-merge-31034
...
[MIRROR] Nightmare organs
2017-10-04 02:14:22 -04:00
454fb160a8
Merge pull request #3112 from Citadel-Station-13/upstream-merge-31188
...
[MIRROR] Gives nightmares a random shadowling name
2017-10-03 20:15:31 -04:00
1c199d426b
Merge branch 'master' into upstream-merge-31034
2017-10-03 20:15:07 -04:00
84d98d5973
Merge pull request #3106 from Citadel-Station-13/upstream-merge-31208
...
[MIRROR] Makes mobs on fire light up
2017-10-03 20:12:24 -04:00
b5e0981d62
Merge pull request #3102 from Citadel-Station-13/upstream-merge-31250
...
[MIRROR] Greatly speeds up bees
2017-10-03 20:11:25 -04:00
a3cea89134
Merge pull request #3099 from Citadel-Station-13/upstream-merge-31228
...
[MIRROR] fixes healguardians not being able to heal people
2017-10-03 20:10:42 -04:00
befcfd1f06
Merge pull request #3095 from Citadel-Station-13/upstream-merge-31202
...
[MIRROR] Organ initialization cleanup
2017-10-03 20:10:08 -04:00
dc9b438bd8
Update skeletons.dm
2017-10-03 18:47:01 -05:00
e4d6219f1d
Update brain_item.dm
2017-10-03 18:46:41 -05:00
65a73bcefa
Gives nightmares a random shadowling name ( #31188 )
...
* fuck you ruined my !ONE COMMIT PR!
* !ONE COMMIT PR!
2017-10-03 18:41:37 -05:00
037ea0ce13
Nightmare organs
2017-10-03 18:22:01 -05:00
baa53ba1d3
Merge pull request #31208 from ShizCalev/AINT-NOTHIN-BUT-A-FIRE-STARTA
...
Makes mobs on fire light up
2017-10-03 18:14:10 -05:00
3310d73b7f
Greatly speeds up bees ( #31250 )
...
* Bee perf
* requested changes
2017-10-03 18:04:28 -05:00
21cfddd426
fixes healguardians not being able to heal people ( #31228 )
...
* Update guardian.dm
* Update support.dm
* Update guardian.dm
2017-10-03 17:48:50 -05:00
159835db24
Fixes humans having no examine feedback for soft crit ( #31247 )
...
* Soft crit examine
* Concise
2017-10-03 15:30:57 -05:00
05f5ee73ce
Merge pull request #2922 from Daniel0Mclovin/Kris's-Garbage
...
Podpeople available as roundstart ft. minor stat changes
2017-10-03 15:22:43 -04:00
fd5acc5573
Organ initialization cleanup
2017-10-03 14:18:39 -05:00
0888d3944e
Merge pull request #31210 from MoreRobustThanYou/patch-7
...
Silicons can no longer take brain damage
2017-10-03 06:20:51 -05:00
42cfb61f42
Edited regen
...
Made it proper
2017-10-03 01:55:50 -05:00
221404bffb
cleaned up some things
2017-10-03 01:42:18 -05:00
dffcebf4ff
[MIRROR] Remove ash drake hide from lesser ash drakes butcher loot ( #2938 )
...
* Merge pull request #30884 from Arianya/patch-1
Remove ash drake hide from lesser ash drakes butcher loot
* Remove ash drake hide from lesser ash drakes butcher loot
2017-10-02 23:20:55 -07:00
3e6ceaa9a2
Revert "Organize hair and facial hair in character creation" ( #3084 )
2017-10-02 23:16:51 -07:00
08b9a11536
Update retaliate.dm
2017-10-02 17:32:54 -05:00
3e26e09db8
ismecha define
2017-10-02 01:04:53 -05:00
cc8f494f1f
Merge pull request #3036 from Citadel-Station-13/upstream-merge-31129
...
[MIRROR] Cleans up some antag/event landmark checks
2017-10-01 23:36:48 -04:00
05022208e3
Merge pull request #3067 from Citadel-Station-13/upstream-merge-31213
...
[MIRROR] Revert "Prompt for observer confirmation now happens when you click it initially"
2017-10-01 20:48:09 -04:00
d4321ac0b5
Accidentally put a comma
2017-10-01 17:26:45 -05:00
2d835e1d73
Nerfed overall healing
...
dialed down to 0.7
2017-10-01 17:25:20 -05:00
d3ae434b56
Changed a few stats
...
Darkness now does oxy damage and slight toxin, added a bit more heat mod, no longer heals toxin damage, oxygen loss healing nerfed. Can eat in the dark to try to combat starvation, added slight toxin damage to make it harder to stay in the dark with a shit ton of food.
2017-10-01 17:20:44 -05:00
64ced3f6f4
Merge pull request #3061 from Citadel-Station-13/upstream-merge-31114
...
[MIRROR] Fixes space vision
2017-10-01 16:56:24 -04:00
e2dd424fb0
Revert "Prompt for observer confirmation now happens when you click it initially"
2017-10-01 15:50:27 -05:00
0480bebc8b
Merge pull request #3058 from Citadel-Station-13/upstream-merge-31167
...
[MIRROR] Prompt for observer confirmation now happens when you click it initially
2017-10-01 16:38:27 -04:00
cef0d9ef68
Merge pull request #3052 from Citadel-Station-13/upstream-merge-31165
...
[MIRROR] fixes delete hotkey triggering messages when the user isn't even a living mob
2017-10-01 16:35:53 -04:00
3d2b5e99c9
Merge pull request #3039 from Citadel-Station-13/upstream-merge-31143
...
[MIRROR] adds a space
2017-10-01 16:29:35 -04:00
e572d2e529
Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138
...
[MIRROR] Structure istype define
2017-10-01 16:20:56 -04:00
d701230090
Merge pull request #31114 from AnturK/spacevision
...
Fixes space vision
2017-10-01 15:15:54 -05:00
21302e3fdc
Merge pull request #3032 from Citadel-Station-13/upstream-merge-31141
...
[MIRROR] Speeds up simple_animals/hostile/proc/CanAttack()
2017-10-01 15:49:44 -04:00
6ca3deb8d1
Merge branch 'master' into upstream-merge-31129
2017-10-01 15:45:54 -04:00
c56bb27bbd
Merge pull request #31167 from tgstation/Cyberboss-patch-2
...
Prompt for observer confirmation now happens when you click it initially
2017-10-01 14:43:52 -05:00
fafd98ed0e
Merge pull request #3033 from Citadel-Station-13/upstream-merge-31142
...
[MIRROR] Fixes cogscarab sprites not updating
2017-10-01 15:42:35 -04:00
40f541b9da
Merge pull request #3031 from Citadel-Station-13/upstream-merge-31117
...
[MIRROR] Fixes liches losing spells
2017-10-01 15:42:12 -04:00
40bcb74a56
Fixes delete hotkey triggering messages when the user isn't even a living mob ( #31165 )
2017-10-01 09:25:27 -05:00
37942a2279
Update hostile.dm
2017-10-01 01:57:49 -05:00
6a8ca2e02c
Merge branch 'master' into upstream-merge-31037
2017-10-01 02:53:03 -04:00
ef96be641a
Merge pull request #2972 from Citadel-Station-13/upstream-merge-30856
...
[MIRROR] Adds Nars-Ian and clock hawks
2017-10-01 02:50:31 -04:00
81e40cc5c8
Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763
...
[MIRROR] Configuration datum refactor
2017-10-01 02:50:17 -04:00
8be007225b
Merge pull request #3007 from Citadel-Station-13/upstream-merge-31085
...
[MIRROR] Fixes shade attackby
2017-10-01 02:20:35 -04:00
747312cb6d
updates
2017-10-01 00:59:59 -05:00
318d28976f
Merge pull request #31143 from praisenarsie/patch-2
...
adds a space
2017-09-30 21:45:47 -05:00
Jordan Brown