oranges
bb668d7ddf
Remove comment and bandaid fix
2015-09-17 15:12:00 +12: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
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
05df6cc80b
Merge pull request #11793 from phil235/AnonusBlobTweak
...
Blob code tweaks (with less commits)
2015-09-15 16:12:16 +02:00
phil235
fcaee7b6a6
Merge pull request #11776 from joonoro/oversights
...
fix atmos spawning with 2 t-ray scanners
2015-09-15 16:06:11 +02:00
phil235
04287730bd
Copy of Anonus' Blob tweak PR, with less commits.
2015-09-15 16:03:55 +02:00
Cheridan
037bce50c2
Merge pull request #11772 from xxalpha/fixthelathe
...
Fix autolathe rejecting stacks.
2015-09-15 08:01:59 -05:00
Razharas
d42b9918b5
Merge pull request #11622 from Core0verload/matter
...
Adds materials to ore
2015-09-15 12:43:56 +03:00
Razharas
cff0e4354a
Merge pull request #11721 from Xhuis/drone_dispenser_tweaks
...
Drone dispenser usability tweaks
2015-09-15 12:33:41 +03:00
Cheridan
3f3d24f063
Merge pull request #11707 from phil235/ShieldThrowTableFixes
...
Shield blocking stuff
2015-09-14 23:08:57 -05: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
f8d8e5e070
Merge pull request #11756 from Iamgoofball/patch-122
...
Fixes #11752 , resets CLF3's metab. rate to 4u instead of 0.5u
2015-09-14 18:31:39 -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
caaffa81dd
Merge pull request #11643 from Razharas/SpaceTravel
...
Implements round-randomized space map
2015-09-14 20:37:40 +02:00
phil235
2a5d0b96a1
Merge pull request #11747 from Aranclanos/falsewalls
...
Fixes false walls opening sprite
2015-09-14 20:33:12 +02:00
phil235
1cf98260bb
Merge pull request #11742 from Aranclanos/chestAugs
...
fixes chest augmentations
2015-09-14 20:28:27 +02: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
Razharas
2f34e13177
Merge branch 'master' of https://github.com/tgstation/-tg-station into SpaceTravel
2015-09-14 20:21:00 +03: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
Jordie
e4979d2a90
Merge pull request #11735 from Thunder12345/cheap_tech_shells
...
Removed the silver cost from techshells
2015-09-14 20:36:08 +10:00
Orange Borg
27a23a845f
EXTERMINATE EXTERMINATE EXTERMINATE
2015-09-14 22:06:47 +12:00
Joonatan O'Rourke
55eb0cfb7c
fix atmos spawning with 2 t-ray scanners
2015-09-14 09:39:08 +03:00
phil235
c9588662f7
Removed generate_uni_identity from randomize_human() proc since it's already called by ready_dna right after.
...
Simplifies mutation overlay updating code.
2015-09-14 00:58:25 +02:00
xxalpha
0a055f101a
Fix material container
2015-09-13 23:35:49 +01: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
77787688ec
fix
2015-09-13 23:47:03 +03:00
c0
75f2c92ebc
Adds materials to ore
2015-09-13 23:37:13 +03:00
Thunder12345
4c64e11155
Silly line, trying to escape the delete key
2015-09-13 17:12:49 +01: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
Remie Richards
38605d1aee
Merge pull request #11712 from MrStonedOne/patch-37
...
Ghost follow is now an orbit!
2015-09-13 16:42:05 +01:00
Kyle Spier-Swenson
cf390ae1ef
Fixes orbiting a deleted atom sending you to null space
...
This also handles the garbage collection issues. As far as i'm concerned, if its been qdeled, but loc isn't null, it's fair game for orbits.
2015-09-13 08:35:22 -07:00
Xhuis
3c0ba3f3bf
Merge remote-tracking branch 'remotes/upstream/master' into drone_dispenser_tweaks
2015-09-13 11:33:50 -04:00
Swag McYolosteinen
0f6705d856
Merge pull request #11560 from Fox-McCloud/runereveal
...
Fixes Bibles Not Revealing Runes
2015-09-13 17:32:40 +02:00
Swag McYolosteinen
30b140ae8a
Merge pull request #11603 from Fox-McCloud/stimulantsfix
...
Fixes Stimulants Speedbuff
2015-09-13 17:32:19 +02:00
Swag McYolosteinen
49968d033d
Merge pull request #11675 from MrStonedOne/patch-36
...
Fixes text gurbling in coms console and shuttle call's priority announcement
2015-09-13 17:31:51 +02: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
ed2858c2e2
Merge pull request #11737 from xxalpha/itsakindofmagic
...
Fixed eye wear overriding see_invisible when it shouldn't.
2015-09-13 17:27:19 +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
05195d98b2
Merge pull request #11693 from Jordie0608/ofcoursemoreregexisgoodwhatareyoutalkingabout
...
Fixes loading jobs from .txt
2015-09-13 17:24:54 +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