xxalpha
b119b0e113
Added a self-repair module for cyborgs.
2015-09-17 15:56:39 +01:00
Cheridan
76d1e6add5
Merge pull request #11556 from bgobandit/hardmeatspike
...
MEAT SPIKE EXPANSION
2015-09-16 20:19:42 -05: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
oranges
48f86bc9f5
clean up more non useful comments
2015-09-17 12:23:44 +12:00
xxalpha
4d4b8e64c1
Merge remote-tracking branch 'upstream/master' into n_u_c_l_e_a_r
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-16 23:14:14 +01: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
blah
e976aa20b4
God dammit timing is perfect for no one
2015-09-16 12:55:36 +01:00
blah
1fc4f2c5b2
Welp
2015-09-16 12:51:55 +01:00
blah
ccbbf623bb
Makes it better
2015-09-16 12:42:27 +01: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
blah
d14c65d12b
Improves implant tracking by having it search through a list instead of the world
2015-09-16 10:22:52 +01: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
Aranclanos
da3213968c
Merge pull request #11780 from optimumtact/patch-5
...
EXTERMINATE EXTERMINATE EXTERMINATE
2015-09-15 16:02:32 -03:00
Marc R. Uchniat
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
phil235
04287730bd
Copy of Anonus' Blob tweak PR, with less commits.
2015-09-15 16:03:55 +02:00
Razharas
d42b9918b5
Merge pull request #11622 from Core0verload/matter
...
Adds materials to ore
2015-09-15 12:43:56 +03:00
Cheridan
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
Cheridan
d1e1beb713
Merge pull request #11748 from Aranclanos/pipep1
...
Fixes the last remaining associative lists from pipes
2015-09-14 18:26:46 -05:00
Marc R. Uchniat
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
phil235
2333eb6b55
Merge pull request #11763 from RemieRichards/FootprintTweaks
...
Footprint Tweaks
2015-09-14 20:50:23 +02:00
phil235
2a5d0b96a1
Merge pull request #11747 from Aranclanos/falsewalls
...
Fixes false walls opening sprite
2015-09-14 20:33:12 +02:00
bgobandit
aac0dd4d22
Adds origin tech values to a lot of items.
2015-09-14 14:27:01 -04:00
phil235
e46f764113
Merge pull request #11623 from Fox-McCloud/qmvoucher
...
Adds Mining Voucher to QM's Locker
2015-09-14 19:59:47 +02:00
Swag McYolosteinen
606c6e0ae4
Merge pull request #11677 from xxalpha/aliums
...
Xeno tweaks and bugfixes.
2015-09-14 17:00:14 +02:00
Jordie
41e426c5ef
Merge pull request #11744 from Thunder12345/cap-uniform
...
Added a new formal jacket to the captain's locker
2015-09-14 20:36:15 +10:00
Orange Borg
27a23a845f
EXTERMINATE EXTERMINATE EXTERMINATE
2015-09-14 22:06:47 +12:00
Incoming5643
ca101e4d82
Upgrades the anti spam flag to five minutes
...
Come in from downwind, then pull up fast! Get ready to fast rope down to Shell One! Five minutes to ETA! Alpha, your top priority is to rescue and safeguard the President! Team Bravo, watch out for Stillman's back, and get those C4's disarmed!
2015-09-13 19:10:59 -04:00
phil235
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
c0
75f2c92ebc
Adds materials to ore
2015-09-13 23:37:13 +03:00
Thunder12345
6724b7bca7
Make formal jacket a subtype of the carapace, replaces spare carapace in captain's locker, and is armoured
2015-09-13 17:10:30 +01:00
Swag McYolosteinen
b5e4eefe8b
Merge pull request #11685 from bgobandit/fuckingprogressbarsfuck
...
Mop progress bar now actually works.
2015-09-13 17:30:50 +02:00
Swag McYolosteinen
ac41b600ce
Merge pull request #11718 from phil235/TableClimbingFixes
...
Tableclimbing & reagent runtime fixes
2015-09-13 17:26:33 +02:00
Swag McYolosteinen
d57fac141a
Merge pull request #11724 from RemieRichards/LargeInhands
...
Inhands can now come in ANY SIZE, not just 32x32!
2015-09-13 17:23:36 +02:00
Remie Richards
7b6bbbfed1
Further tweaks.
2015-09-13 16:17:50 +01:00
Remie Richards
4bb97067b2
Tweaks amount of footprints, and fixes some bugs related to footprints, adds shoetype tracking to footprints
2015-09-13 15:36:56 +01:00
Fox-McCloud
9b668de7bb
Merge remote-tracking branch 'upstream/master' into Impropermaterials
2015-09-13 08:58:40 -04:00
Steelpoint
5783cdda03
Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-13 20:00:41 +08:00
Jordie
7530c0e133
Merge pull request #11680 from bgobandit/honktarget
...
Adds a clown shooting target.
2015-09-13 21:50:53 +10:00
Marc R. Uchniat
43371ccef8
change bb to BB to gain favor with goofball
2015-09-12 23:47:29 -07:00
Aranclanos
815ef798e9
Fixes the last remaining associative lists from pipes
2015-09-12 20:57:16 -03:00
Marc R. Uchniat
f478c5ebb0
Merge remote-tracking branch 'upstream/master' into suicides-sep12
2015-09-12 16:53:00 -07:00
Marc R. Uchniat
c557f763d8
YOU'LL SHOOT YOUR EYE OUT, KID! also: minor fix to newspaper suicide language
2015-09-12 16:52:27 -07:00
Aranclanos
c4505bd25b
Fixes false walls opening sprite and a small runtime when they finish their opening or close in the GC queue.
2015-09-12 20:37:22 -03:00
Marc R. Uchniat
9a21b5d73b
HE SHALL RIDE ETERNAL, SHINY AND CHROME
2015-09-12 15:18:29 -07:00
Fox-McCloud
ffa823e5b9
floor tile materials fixup
2015-09-12 16:11:48 -04:00
Thunder12345
cf2d0903f6
Added a new formal jacket to the captain's locker
2015-09-12 21:10:16 +01:00
Supermichael777
a9e4af8146
it will no longer explode randomy but has a higher chance to bounce
2015-09-12 12:23:03 -04:00
bear1ake
c52c4a5346
Merge remote-tracking branch 'tgstation/master' into point-zero
...
Conflicts:
code/modules/research/protolathe.dm
2015-09-12 21:07:40 +09:00