Xhuis
66f67946ae
Merge remote-tracking branch 'remotes/upstream/master' into airlock_charge_buff
2015-09-21 22:18:24 -04:00
Razharas
836c31ac83
Merge pull request #11845 from xxalpha/nanites
...
Added a self-repair module for cyborgs.
2015-09-21 22:06:45 +03:00
Razharas
5f8318de85
Merge pull request #11875 from Aranclanos/adminfollow
...
Removes a sleep in the admin follow command.
2015-09-21 21:59:38 +03:00
Aranclanos
6e117f031e
Merge pull request #11837 from Steelpoint/GunSprites
...
Auto Rifle Sprites and Bug Fixes
2015-09-21 03:23:22 -03:00
Steelpoint
422f7ecfe5
Fix
2015-09-21 10:25:27 +08:00
Steelpoint
2f9a37d624
Changes
2015-09-21 10:21:10 +08:00
Xhuis
4a34f42a0a
Give Syndiborgs more stuff
2015-09-20 14:38:25 -04:00
Swag McYolosteinen
1a5df1d08b
Merge pull request #11846 from GunHog/RadsPlzKThxLol
...
Advanced Energy Gun fixes
2015-09-20 20:36:17 +02:00
Remie Richards
225eee3d2f
Merge pull request #11815 from spasticVerbalizer/shootFooting
...
Makes clumsy misfires actually target a leg
2015-09-20 17:24:24 +01:00
Swag McYolosteinen
9cfdb75295
Merge pull request #11852 from Xhuis/cult_update_update
...
Cult Refactor Update
2015-09-20 17:53:35 +02:00
Maarten van den Berg
f3f080693a
Adds zone_override var to process_fire and friends, updates clumsy and gun suicide
2015-09-20 16:52:39 +02:00
Xhuis
76b90ef25c
Adds a variable, can_unsuppress
2015-09-19 14:25:16 -04:00
Xhuis
f53897523c
Conflicts 2/3
2015-09-19 14:07:24 -04:00
phil235
bfa06222ea
Merge pull request #11830 from Aranclanos/updatetriggerthis
...
Removes update_triggers.dm
2015-09-19 16:47:19 +02:00
Aranclanos
25f998393a
Removes a sleep in the admin follow command.
2015-09-19 10:41:59 -03:00
Remie Richards
82a79a1705
Merge pull request #11787 from bgobandit/theywanttherandd
...
Adds origin tech values to a lot of items.
2015-09-19 14:20:09 +01:00
Remie Richards
c10f8cd6d1
Merge pull request #11838 from xxalpha/whythough
...
Fixed protolathe not printing things that required reagents.
2015-09-19 14:15:42 +01:00
Remie Richards
6cd3d98017
Merge pull request #11843 from Tokiko1/fertilizerbuff
...
Huge Left4Zed buff
2015-09-19 14:13:16 +01:00
Remie Richards
3d6b98d3cf
Merge pull request #11836 from optimumtact/neopocalypse
...
Remove comment and bandaid fix
2015-09-19 14:11:11 +01:00
Remie Richards
9363a14d2f
Merge pull request #11743 from Delimusca/cleanconfusion
...
changes confusion to be less RNG garbage
2015-09-19 14:01:58 +01:00
phil235
966ff4b05a
Merge pull request #11853 from feemjmeem/11850-fix
...
partial revert of #11699 , fixes #11850 without breaking #11699
2015-09-19 03:18:11 +02:00
Steelpoint
3fb3b49134
Fixes
2015-09-18 20:09:57 +08:00
phil235
d83f6f6d5f
Merge pull request #11608 from Xhuis/blings
...
A few shadowling changes
2015-09-18 13:47:30 +02:00
Steelpoint
a421402cb8
SABR+Sprites+Fixes
2015-09-18 10:38:35 +08:00
Xhuis
0203c3c8c1
Conflicts 3/3
2015-09-17 20:08:26 -04:00
Xhuis
af31d566b2
Syndicate medical cyborgs
2015-09-17 20:02:48 -04:00
Cheridan
23f69d31b2
Merge pull request #11814 from spasticVerbalizer/ghostPaper
...
Allows ghosts to read paper from anywhere
2015-09-17 17:28:39 -05:00
Marc R. Uchniat
75e6b70fbe
partial revert of #11699 , fixes #11850 without breaking #11699
2015-09-17 15:12:18 -07:00
Swag McYolosteinen
9e24350297
Merge pull request #11593 from AnturK/misc
...
Abductor QoL & Event
2015-09-17 19:25:38 +02:00
GunHog
2b7bebb523
Advanced Energy Gun fixes
...
- AE gun can once again be researched more easily by forcing it to
critically fail.
- Fixed reliability rating being able to become negative.
2015-09-17 10:29:03 -05:00
Razharas
a48254f31a
Merge pull request #11589 from Ergovisavi/swarmers_revision_2
...
Swarmer rev 2 fixes/changes | Some hostile mob range attack tweaks
2015-09-17 18:27:15 +03:00
xxalpha
b119b0e113
Added a self-repair module for cyborgs.
2015-09-17 15:56:39 +01:00
xxalpha
1626e02302
Fixed protolathe not printing things that required reagents.
...
Better
Coefficient
2015-09-17 14:09:03 +01:00
Tokiko1
941b86873c
Adjusts mutation probabilities of Left4zed.
2015-09-17 06:56:07 +02:00
Steelpoint
f054521bbf
FixesAndSprites
2015-09-17 11:53:12 +08:00
oranges
bb668d7ddf
Remove comment and bandaid fix
2015-09-17 15:12:00 +12:00
Xhuis
2e09024f9d
Merge remote-tracking branch 'remotes/upstream/master' into airlock_charge_buff
2015-09-16 22:55:54 -04:00
Xhuis
925817539a
Traitor item rebalance
2015-09-16 22:55:45 -04:00
Aranclanos
caf4d7d5a5
Removes update_triggers.dm and moves the code inside of it to their respective procs. Most of the procs on this file were duplicated.
2015-09-16 21:52:25 -03:00
phil235
3ca12736ca
Merge pull request #11700 from feemjmeem/suicides-sep10
...
suicide messages for damp rag, tanks, and telebaton
2015-09-16 23:57:51 +02:00
Swag McYolosteinen
3ef5d02cee
Merge pull request #11689 from Steelpoint/RifleS
...
Security Weapon Overhaul: Auto Rifle Edition
2015-09-16 13:34:35 +02:00
Steelpoint
e51eefbe34
MoreChanges
2015-09-16 18:00:21 +08:00
Steelpoint
62e7f1204d
NewChanges
2015-09-16 17:53:04 +08:00
Maarten van den Berg
9837ad6ab7
Makes clumsy misfires actually target a leg
2015-09-16 11:11:05 +02:00
Maarten van den Berg
f7d5f7bdd7
Allows ghosts to read paper from anywhere
2015-09-16 10:42:38 +02:00
bgobandit
0664cffa45
tweaks shit
2015-09-15 21:43:19 -04:00
Xhuis
1178fbe079
Major cult changes
...
The current code for runes is god-awful. Like, seriously terrible. This PR aims to fix that. Rather than having every rune effect defined in a single attack_hand proc, this PR will separate the runes into subtypes, which supports for more modular runes as well as cleans up the code.
It also separates invocation into a two different procs. The first of these will determine if the rune can be invoked; if that passes, the second will cause the rune's effects. There is also a third proc that will cause effects if the rune fails to invoke.
Research words have been removed, and all runes are now available from the start of the round. This is highly subject to change once some feedback is in from actual cult rounds.
Miscellaneous tweaks:
Blood boil runes now explode when used
Convert runes can now work solo, but take time
Armor runes now only provide the basic armor set
Tomes now do a static 15 burn damage and play a sound
If the Escape objective is rolled, the amount of people that must escape will scale with the round population to a factor of 5 (i.e. 50 players = 10 cultists)
2015-09-16 10:04:49 +12:00
Razharas
73db85100c
Merge pull request #11769 from phil235/FixMutations
...
Some dna fixes
2015-09-15 22:31:59 +03:00
Razharas
d42b9918b5
Merge pull request #11622 from Core0verload/matter
...
Adds materials to ore
2015-09-15 12:43:56 +03:00
Cheridan
3f3d24f063
Merge pull request #11707 from phil235/ShieldThrowTableFixes
...
Shield blocking stuff
2015-09-14 23:08:57 -05:00
