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
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
73db85100c
Merge pull request #11769 from phil235/FixMutations
...
Some dna fixes
2015-09-15 22:31:59 +03:00
4ee9e11860
telebaton and tank suicides now check for deletion properly, telebaton properly deletes brain, tank no longer drops brain
2015-09-15 10:02:46 -07:00
04287730bd
Copy of Anonus' Blob tweak PR, with less commits.
2015-09-15 16:03:55 +02:00
d42b9918b5
Merge pull request #11622 from Core0verload/matter
...
Adds materials to ore
2015-09-15 12:43:56 +03:00
0a8690edf0
Merge pull request #11738 from Supermichael777/detomax
...
Buffs the detomax pda bomb by removing its RANDOM EXPLOSION MECHANIC.
2015-09-14 18:37:53 -05:00
a1439aaa4a
make telebaton actually open if closed, add check to make sure mob still exists when you do magic to it (thanks @phil235)
2015-09-14 12:38:45 -07:00
428a28a440
Fixes monkeyize/humanize removing the mob's viruses when they should be kept.
...
Fixes NOCLONE and CLUMSY being in both disabilities and mutations. they're now only disabilities.
Fixes minttoxin not gibbing people with the fat disabilities.
Fixes some runtimes, replacing usr by user in some places.
Fixes mutation overlays being removed when updating overlays.
Remove the now unused mob/var/list/mutations and human/var/blood_type
Fixed some formatting in preferences.dm
2015-09-13 22:52:38 +02:00
75f2c92ebc
Adds materials to ore
2015-09-13 23:37:13 +03:00
b5e4eefe8b
Merge pull request #11685 from bgobandit/fuckingprogressbarsfuck
...
Mop progress bar now actually works.
2015-09-13 17:30:50 +02:00
9b668de7bb
Merge remote-tracking branch 'upstream/master' into Impropermaterials
2015-09-13 08:58:40 -04:00
7530c0e133
Merge pull request #11680 from bgobandit/honktarget
...
Adds a clown shooting target.
2015-09-13 21:50:53 +10:00
ffa823e5b9
floor tile materials fixup
2015-09-12 16:11:48 -04:00
a9e4af8146
it will no longer explode randomy but has a higher chance to bounce
2015-09-12 12:23:03 -04:00
c52c4a5346
Merge remote-tracking branch 'tgstation/master' into point-zero
...
Conflicts:
code/modules/research/protolathe.dm
2015-09-12 21:07:40 +09:00
89fa65c127
Fixes Consistency Issue with Materials
2015-09-12 03:51:33 -04:00
922cd5d666
removed extraneous hgibs() call in tanks.dm, turned spaces to tabs in affected files to make remie and everyone else happy
2015-09-11 13:03:33 -07:00
3e4c8ab291
tank suicide: pops you like a balloon and spits out your brain, also minor style change for consistency on telebaton
2015-09-11 11:48:30 -07:00
64fd1c317c
telebaton suicide: changed message, added gibs, added removal of brain
2015-09-11 11:30:36 -07:00
3a63c31614
Merge pull request #11626 from Memendia/master
...
Suicide txt fix
2015-09-11 14:16:30 +03:00
2f9cbf9536
suicide messages for damp rag, tanks, and telebaton
2015-09-10 11:44:27 -07:00
f697ae90f5
removes a bunch of .0
2015-09-10 20:57:30 +09:00
4efae3bc02
Mop progress bar now actually works.
2015-09-09 22:04:47 -04:00
cf42935119
Adds extra HONK. Tweaks sprite.
2015-09-09 16:27:21 -04:00
a8ce6c012b
Adds a clown shooting target for security to unload their anger.
2015-09-09 14:35:45 -04:00
b3b9941432
Merge branch 'master' of https://github.com/tgstation/-tg-station into matsblastusa
...
Conflicts:
code/modules/assembly/flash.dm
2015-09-09 14:04:41 -04:00
046b7fbad3
I told ya
2015-09-07 03:40:07 -07:00
c5984f4359
Merge branch 'master' of https://github.com/tgstation/-tg-station into legitposters
...
Conflicts:
_maps/map_files/MetaStation/MetaStation.v41G.dmm
2015-09-06 13:27:51 -04:00
93b9f96cfa
Merge pull request #11341 from bgobandit/suicideisnotajoke
...
Adds/tweaks several suicide messages.
2015-09-06 06:42:00 +03:00
cbe2e310c6
Merge pull request #11573 from Fox-McCloud/plasmagold
...
Fixes Gold Sheets Containing Plasma
2015-09-05 11:54:34 -05:00
362157a5d5
t y p o h o n k
2015-09-04 22:21:51 -04:00
261494e659
Made some changes and repathing for posters.
2015-09-04 18:30:58 -04:00
df7386a4ec
Assemblies update
2015-09-04 11:22:37 +03:00
0b8f2476b4
Fixes Gold Sheets Containing Plasma
2015-09-04 01:44:13 -04:00
1748a8c261
ADDS EXTRA HONK
2015-09-03 14:34:53 -04:00
ca34015b85
Removes minibomb suicide message. Fixes wand suicide message.
2015-09-02 23:07:40 -04:00
d2903d077f
Merge pull request #11530 from xxalpha/coilcablecorrection
...
Fixed a couple of bugs with cable coils.
2015-09-02 22:55:47 -03:00
00f01159b1
Fixes Merge conflicts
2015-09-01 19:46:30 -07:00
70d97ad5e4
Fixed a couple of bugs with cable coils.
2015-09-01 22:35:04 +01:00
72610973cc
Merge pull request #11427 from xxalpha/magborg
...
Gave engineering cyborgs permanent magboots effect.
2015-09-01 17:31:15 +03:00
9d6ce85e9a
Merge pull request #11414 from Xhuis/shadowling_update_4
...
Shadowling Update IV
2015-09-01 17:19:07 +03:00
bfbe4e997e
Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE
...
Makes all Destroy() procs return properly
2015-09-01 15:54:18 +03:00
6464aafa7c
Merge pull request #11494 from Aranclanos/PDAqdel
...
Fixes PDAs being able to send messages to other PDAs in the qdel queue
2015-09-01 15:53:26 +03:00
30ac2634f4
Merge pull request #11250 from GunHog/Malf_RCD-defense
...
Buffs RCD Disable Malfunction ability
2015-09-01 11:50:17 +03:00
446e784017
Merge pull request #11318 from kingofkosmos/borgdedcoverunlock_aidedunanchor
...
Cyborgs unlocking cover and AI unanchoring upon dying.
2015-09-01 10:08:08 +03:00
e18032c87a
Merge pull request #11411 from Xhuis/help_xenos_in_medbay_maint
...
MEGA Toys presents: Xenos Isolated action figure!
2015-09-01 09:58:15 +03:00
48b67e5a25
Merge branch 'master' of https://github.com/tgstation/-tg-station into returnQDEL_HINT_LETMEDIE
...
Conflicts:
code/game/objects/effects/landmarks.dm
2015-09-01 00:11:33 -06:00
da60a351bd
Merge pull request #11493 from Aranclanos/camerabugloop
...
Fixes an infinite loop with camera bugs.
2015-08-31 22:38:02 -05:00
d23f2cb622
mats for toolboxes, glasses and flashes; adjusts coin amounts up slightly
2015-08-31 12:14:34 -04:00
phil235
Xhuis
Razharas
Marc R. Uchniat
phil235
Cheridan
c0
Swag McYolosteinen
Fox-McCloud
Jordie
Supermichael777
bear1ake
bgobandit
Memendia
Aranclanos
palpatine213
xxalpha
duncathan