Robustin
5569c259ab
Merge branch 'master' into culttweaks2
2017-05-22 10:36:57 -04:00
ClosingBracket
133340aa0b
Fixed very minor capitalization and punctuation inconsistencies. ( #27490 )
2017-05-22 09:25:27 -03:00
Really-Good-Soda-Flavor
41294bd58d
Reorganizes martial arts and stores them in the MIND. ( #27324 )
...
* Reorganizes martial arts and stores them in the MIND.
* Moves martial arts to mind.
* Added more sanity checks
* MORE sanity checks!
* Fixes the checks.
2017-05-22 14:12:27 +02:00
Leo
795622fac1
Merge pull request #27473 from swindly/monkey_nerf
...
Nerfs monkeys
2017-05-21 20:28:03 -03:00
RandomMarine
15c35e648d
Changed law 3 ( #27452 )
2017-05-21 06:07:24 -04:00
KorPhaeron
7942aa4e5b
Two more types of Legion and makes environment_smash levels into defines ( #27160 )
...
One is another small legion, but it can infest corpses, meaning it will revive other legions if you don't kill it first.
The other is a legion that creates legions. I imagine it as something super edgy like a golem made up of legions melded together.
I need sprites for both of these
Added defines for environment_smash
2017-05-21 19:51:52 +12:00
swindly
31f2942e8d
nerfs monkeys
2017-05-20 18:04:20 -04:00
Robustin
425e8fca71
Fixes galore
2017-05-19 18:20:48 -04:00
Joan Lung
9722f0fcf0
Merge pull request #27395 from lzimann/xeno
...
Fixes having more movespeed when xenos hug themselves
2017-05-19 13:31:47 -04:00
Lzimann
88838ce67c
Clamp
2017-05-19 08:18:21 -03:00
4DPlanner
c87e6f85ec
Merge remote-tracking branch 'upstream/master' into clubbuff
2017-05-18 21:52:31 +01:00
Lzimann
521c67389b
Fixes having more movespeed when xenos hug themselves
2017-05-18 14:37:54 -03:00
kevinz000
16b44c2937
[READY]Peacekeeper cyborg projectile dampening fields, attempt three ( #27234 )
...
* fields
* peaceborg dampeners
* hm
* nerfs recharge
* ...
* fffff
* objectively fields
* kinda_working
* why is this not working
* cheep
* bugfixes, adds to robot
* cross doesn't work ;-;
* on border
* appearance
* hi, is this a refactor?
* ffs
* ree
* monitor
* monitor
* hm
* all good
* Update robot_items.dm
2017-05-18 10:53:55 -06:00
AnturK
7dd00e28ac
Fixes bane runtimes ( #27368 )
...
* Fixes bane runtimes
* You're a big typo
2017-05-18 10:31:08 -06:00
Joan Lung
1b7c4a63dc
Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual ( #27344 )
2017-05-17 22:54:54 -05:00
4DPlanner
1270c10082
Hierophant boss deals double damage to intruders
2017-05-17 17:50:24 +01:00
4DPlanner
586ec27ac3
Damage is now consistent across lavaland and non-lavaland mobs, and
...
teleport never friendly fires
2017-05-17 17:05:52 +01:00
4DPlanner
07768b376f
Buffs hierophant club
2017-05-17 16:36:22 +01:00
QualityVan
b27665d293
Adjusts ear/eye protection based on missing organs ( #27291 )
2017-05-16 09:07:35 +02:00
Robustin
3f47e55fe1
Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition ( #27085 )
...
* Chosen Harvesters
* Update runes.dm
* New Cult Ending
* New Cult Ending
* Cinematics added
* A couple fixes
* Update ticker.dm
* Final Touches
* Done
* Desc fix
* Update alert.dm
* Update cult_comms.dm
* requested changes
* Update uplink_item.dm
* Update alert.dm
* Update runes.dm
* Update runes.dm
* fuckinglaunchpad
* Update machine_designs.dm
* Fucking launchpad errors
* Update narsie.dm
* Update mode.txt
* moves a few pixels on the sprite for Joan
* whatever just merge it
* You know whats BS?
* While you're at it... merge this shit
* Update living_defense.dm
* Update constructs.dm
* Update living_defense.dm
2017-05-16 08:50:46 +02:00
ma44
94b8d5789a
Remaps seed vault, adds bees and changes cherry to cherry bomb in random seed spawn ( #27206 )
2017-05-14 21:45:25 -03:00
Leo
6abce7443f
Merge pull request #27200 from coiax/nom-mushrooms
...
Goats eat glowshrooms
2017-05-14 09:37:38 -03:00
TrustyGun
ac51badffd
Petting is better ( #27215 )
2017-05-14 09:36:19 -03:00
Leo
5bd4911358
Merge pull request #27203 from ChangelingRain/vesselfix
...
Soul Vessels now have the proper laws
2017-05-13 23:15:22 -03:00
coiax
35d0046899
Servant golems do not have special names ( #27171 )
...
🆑 coiax
add: Servant golems now follow the "Material Golem (123)" naming scheme.
/🆑
How to tell the difference between a free and a servant golem. The Free
Golem has a cooler name.
- Also some tidying of golem code, no gameplay changes.
2017-05-13 07:37:50 -06:00
Leo
4db2efa0b4
Merge pull request #27173 from Cyberboss/patch-76
...
Fixes something not using create_reagents
2017-05-13 10:35:41 -03:00
Cyberboss
ac11813bad
Cleans up some Initializes ( #27174 )
2017-05-13 07:35:18 -06:00
Jack Edge
032649e6c8
Goats eat glowshrooms
...
🆑 coiax
add: Goats on the station have developed a taste for glowshrooms, and
will eat them if they encounter any.
/🆑
Glowshrooms are hard to get rid of, so let's add some additional plant
destroying abilities to the chef's goat. Hope he didn't butcher it into
meat!
2017-05-13 10:47:23 +01:00
Joan Lung
3c76f62bde
Soul Vessels have the proper laws
2017-05-12 18:44:26 -04:00
KorPhaeron
752e25d417
Zombies can see in the dark ( #27152 )
2017-05-12 17:57:07 -03:00
Cyberboss
b888c2ee57
Fixes something not using create_reagents
2017-05-12 09:13:47 -04:00
coiax
dfc04482ee
People can be cloned from heads or brains ( #27068 )
2017-05-12 08:06:42 -03:00
Joan Lung
2daff3ab8a
Wraiths now refund part of Phase Shift's cooldown by attacking ( #27119 )
2017-05-11 22:39:18 -03:00
Joan Lung
15cd77d3ae
Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie ( #27104 )
2017-05-11 22:38:21 -03:00
XDTM
122c1e79a8
Plasma golem tweaks ( #27129 )
2017-05-11 16:54:06 -03:00
Joan Lung
3711b58f36
Harvesters are more fun to play ( #27086 )
2017-05-10 12:18:15 -03:00
Mike Long
4687dd0117
Devil refactor+small revamp ( #26815 )
...
Hello, with PR #26717 merged, I think it's a good time to add devils to the standardized antag datum system.
This PR is mostly a refactor, which shouldn't be noticed by the playerbase. Changes that might be noticed are below.
🆑
tweak: Modified chances for returning someone's soul using an employment contract. Now everyone has a chance, not just lawyers and HoP.
add: Particularly brain damaged people can no longer sign infernal contracts properly.
tweak: Infernal contracts for power no longer give fireball, and instead give robeless 'lightning bolt' spell.
add: Devils can now sell you a friend, for the cost of your soul.
tweak: The codex gigas should now be easier to use, and less finicky.
del: The codex gigas no longer sintouches readers.
/🆑
2017-05-10 22:02:17 +12:00
Leo
da846e9047
Merge pull request #27077 from MrStonedOne/patch-363
...
Fixes status stat panel
2017-05-09 15:08:53 -03:00
coiax
fc9ffbb848
Visible ghosts emit light ( #27027 )
2017-05-09 13:28:53 -03:00
Leo
d1ead5ffad
Merge pull request #27063 from kevinz000/patch-147
...
Fixes riding messages always using male pronouns
2017-05-09 07:43:30 -03:00
Kyle Spier-Swenson
f5cea174b9
fixes status stat panel
2017-05-08 11:06:12 -07:00
oranges
e8c1c60942
Merge pull request #26980 from AnturK/click-fixes
...
Small Click refactor.
2017-05-08 20:05:39 +12:00
kevinz000
9e5b968e45
Update robot.dm
2017-05-07 23:54:48 -07:00
kevinz000
43aa9f44fa
Update robot.dm
2017-05-07 23:44:33 -07:00
Jordie
513e953378
Merge pull request #26986 from Cyberboss/patch-68
...
Adds round ID to MC panel
2017-05-08 11:04:50 +10:00
Jordie
8e0f479ebd
move round if to status panel
2017-05-08 10:55:53 +10:00
Leo
a0997913d6
Merge pull request #26966 from KorPhaeron/chasmflight
...
Fixes being able to stand on chasms
2017-05-07 20:06:13 -03:00
QualityVan
ea5426b09d
Refactors blood regeneration from nutriment ( #26998 )
2017-05-07 20:04:57 -03:00
Leo
c5ba008169
Merge pull request #26959 from KorPhaeron/jungle
...
Mega arachnid
2017-05-07 10:54:09 -03:00
Joan Lung
5ce91a8230
Cultists of Nar-sie have their own language ( #26952 )
2017-05-07 08:06:38 -03:00
