Commit Graph

13438 Commits

Author SHA1 Message Date
Fox-McCloud 46f5acf01c black powder spam 2015-04-18 01:32:09 -04:00
Fox-McCloud df94ccb855 fix for infinite explosions 2015-04-17 23:07:22 -04:00
DZD 415e2caaa3 Organ fixes
### Current Changes
- Removes the rejecting verb from organs, I forgot to remove this along
with organ rejection.
- Fixes droplimb runtime.
- As a result, brute damage goring and burn ashing DESTROYS whatever
limb was dismembered. They didn't do so before due to the runtime.
- Fixes another runtime in organ_external.dm
- Makes it so you can actually clone brain transplantees.
- Makes it so you can actually rejuvenate brain transplantees.
### Todo
- [ ] Make slime person braincores able to be placed in humanized
monkeys again.
- [ ] Probably fix some other stuff.
2015-04-17 18:35:03 -04:00
Fox-McCloud 33233941d5 [Goonchem] Reagent Decals 2015-04-17 18:27:49 -04:00
Tigercat2000 1f69a5ecaa Adds a new martial arts style- Drunk Brawling
This adds a new martial arts datum, labeled as Drunken Brawling. This
style is automatically added and removed to people via ethanol,
specifically, 10 life ticks after they start slurring their words.

The style is mostly debuffs, as there is a flat 50% chance to miss any
harm-intent hit, a 70% chance to fail to grab, and disarm is unaffected.

The actual 'features' of this style can be summarized as such:
 - Custom attack verbs
   - "jab","uppercut","overhand punch",
   "drunken right hook","drunken left hook"
   - Uppercut has a 5% chance to do 14 damage

 - Limit's combat abilities
   - 70% chance to fail to passively grab
   - 50% chance to miss any harm intent
   - Disarm intent is untouched.

 - Added by ethanol when someone has had it into their system
   for a while
   - Removed as soon as the ethanol becomes lower than 3 units
2015-04-16 14:43:26 -07:00
ZomgPonies 98af2982c8 Merge pull request #820 from tigercat2000/Spraycans
Adds spraycans, fixes lipstick, modifies scleaner
2015-04-16 16:39:19 -04:00
ZomgPonies 88e8a67a86 Merge pull request #822 from tigercat2000/globalblocklist
Move hostile blacklist to global variable
2015-04-16 16:38:40 -04:00
ZomgPonies 7a863e53ab Merge pull request #816 from CrAzYPiLoT-SS13/master
Hydro fix & colorful corgis
2015-04-16 16:37:47 -04:00
ZomgPonies e6d7a6f67b Merge pull request #801 from Fox-McCloud/vending
[Goonchem] New Vending Machines
2015-04-16 16:37:32 -04:00
ZomgPonies 68e303a06e Merge pull request #815 from tigercat2000/Selecdefaultlang
Selectable default languages
2015-04-16 16:37:09 -04:00
ZomgPonies ee5961d73e Merge pull request #793 from Fox-McCloud/chainsaws
Adds in Chainsaws
2015-04-16 16:36:20 -04:00
Tigercat2000 9ffdadb252 Move hostile blacklist to global variable
This moves the multiple lists of blacklisted hostile mobs
(as in, unsafe or intended for special use) into a single global
variable. This means that gold slime cores and dimensional tears
now use the same list of mobs, for simplicity.
2015-04-16 09:30:36 -07:00
Fox-McCloud 1491652cca Merge pull request #813 from tigercat2000/Mousedropghostin
Allow admins to drag-drop ghosts into mobs
2015-04-16 00:18:56 -04:00
Fox-McCloud f56f691357 Merge pull request #812 from TheDZD/punch-me-i-dare-you
Martial Arts Port from /tg/
2015-04-16 00:18:02 -04:00
Tigercat2000 b8f5fd5031 Cleanup code and remove needtohack insanity code
This cleans up the code and properly integrates a few things, instead
of the absolutely tragic and insane code bypassing it, literally named
var/needtohack.
2015-04-15 19:44:36 -07:00
Fox-McCloud f8a00c5957 Merge pull request #819 from FalseIncarnate/master
Candy Fixes
2015-04-15 20:20:56 -04:00
Sawu d038a0710c Adds spraycans, fixes lipstick, modifies scleaner
This commit does the following:
 - Adds spraycans as a subtype of crayons.
   - Slight crayon overhaul to make room for this
   - Can spray graffiti, runes, and letters on floors & walls
   - Can spray mobs and paint their face

 - Fixes & overhauls lipstick
   - Lipstick is now overlay and Blend() based.
   - Also fixes a few bugs with the system.
   - Updates paper code to accomodate for wiping off spraypaint as well

 - Slight modification to space cleaner
   - Space cleaner now cleans your face of lipstick and spraypaint
2015-04-15 17:19:08 -07:00
FalseIncarnate 079b6492fd Candy Fixes
- Fixes the bad rainbow cotton candy not actually using a "toxin" as
it's reagent contents.
- - Previously contained Lexorin, now contains Sulfonal.

- Fixes the candy maker "eating" candy moulds and causing a runtime
while doing so.
- - Incorrect recipes still destroy the mould, but successful candy
making will return it's mould as intended.
2015-04-15 20:12:46 -04:00
Fox-McCloud 098a41944c Merge pull request #814 from TheDZD/minor-fixes
Fixes surgery bugs & removes organ rejection
2015-04-15 17:07:45 -04:00
Tigercat2000 b7377185d9 Admin Ghostdrop sanity checks
Applies tgstation/-tg-station@2227b7a to admin.dm and observer.dm

Basically, this adds sanity checks, just to prevent runtimes in the odd
case that something happens. For instance, if one of the mobs suddenly
gets deleted, this will prevent it from runtiming. Sanity checks.
2015-04-15 07:11:34 -07:00
Matt 21929eded3 Hydro fix & colorful corgis
Hydro fix, fixes http://www.github.com/ParadiseSS13/Paradise/issue/683
Added corgis random color when splashed with colorful reagent.
2015-04-15 11:31:31 +02:00
Fox-McCloud c81be9cc5a Merge pull request #806 from tigercat2000/bugsss
Fixes an oversight with NO_BREATHE and corpses
2015-04-15 01:12:31 -04:00
GinjaNinja32 a92e058b6c Selectable default languages
This commit allows any mob which can speak to choose one of their known
languages as 'default', which makes anything that they say with no
prefix (EG; say 'lol'), use that language.

This commit also changes the 'galactic common' language to use :9
instead of :0, as :0 does not work due to BYOND.. strangeness.

Implements two new IC-tab verbs and updates the check-known-languages
panel to also integrate with this system.
2015-04-14 19:21:48 -07:00
DZD 1dde4972f8 Fixes surgery bugs & removes organ rejection
- Makes organ stumps amputatable. (Seriously, why the fuck were they
not? You NEED to remove them to attach new limbs, including heads.)
- Removes organ rejection (But muh reelizms! No, fuck that, test dummies
were rejecting their own organs and dying. Why did this even exist?
- Organs removed from a body take SIGNIFICANTLY longer to take damage
and decay now. That brain you just removed will actually be
transplantable a minute later.
2015-04-14 22:12:19 -04:00
MrStonedOne f6d4aae74a Allow admins to drag-drop ghosts into mobs
This allows administrators to drag their mouse from a ghost to a type of
/mob/living, which will then prompt them if they wish to put that ghost in
control of the mob, and obviously, that is exactly what happens if you
select yes.
2015-04-14 16:29:38 -07:00
DZD ed1f2cc04c Martial Arts port from /tg/
- Ports tgstation/-tg-station#8810 and tgstation/-tg-station#8942
- Puts copypasta grab code in alien_defenses.dm and human_attackhand.dm
files into a single proc in living_defense.dm, grabbedby.
2015-04-14 17:59:13 -04:00
Tigercat2000 9c5745ce7d Add flash_protect defines for 4 objects.
This commit adds flash_protect defines for the objects in this list:
 - Type, flash_protect define
 - /obj/item/clothing/glasses/hud/health_advanced, 1
 - /obj/item/clothing/glasses/hud/security, 1
 - /obj/item/clothing/helmet/space/eva, 0
 - /obj/item/clothing/head/helmet/space/rig/medical, 0
2015-04-13 19:20:59 -07:00
Malkevin 9deb16dcdb Improved eyecheck()
Changes flash/welder protection eyecheck() proc from several hard coded
item checks to a /var check for eye covering items, reducing the number
of IF statements and allowing greater flexibility as child items can
have a different protection level to their parent.

Created a new proc tintcheck()
-Items have a separate tint var to allow for items to protect
but not impair, such as space helmets.

-tintcheck() adds these up for eye covering locations

-life.dm uses this new proc when checking to apply the welder overlay
instead of hardcoded if statements
2015-04-13 17:57:38 -07:00
Fox-McCloud dca6fac85f Merge pull request #789 from Spacemanspark/master
Removes setting someone's mode to walk or run mode on aimmode.
2015-04-13 17:16:11 -04:00
Fox-McCloud 17ed330278 typo 2015-04-13 17:14:17 -04:00
Tigercat2000 f3c9a558e2 Fixes an oversight with NO_BREATHE and corpses
This fixes:
 - Issue #778 on https://github.com/ParadiseSS13/Paradise

There was no sanity checking to test if mobs in range of a corpse have
the NO_BREATHE flag. This commit adds such a check. It does not make
sense for species like machine people to vomit. It may make sense for
Slime People and Dionae, but, after all, it's sentient slime and a tree
thing. Are they are even capable of regurgitating their food?
2015-04-13 11:44:14 -07:00
ZomgPonies 8de1428b51 Completely remove the deprecated mutantrace stuff 2015-04-13 08:07:58 -04:00
ZomgPonies dddecb9025 Change slime people to not need mutantrace anymore. 2015-04-13 07:59:25 -04:00
ZomgPonies 1b4bfe1196 Removing all mutantrace crap except for slimepeople 2015-04-13 06:20:17 -04:00
ZomgPonies 55dbbc32b5 Might as well update golems also 2015-04-13 06:05:42 -04:00
Fox-McCloud aaf3be77fb New Vending Machines 2015-04-13 03:27:41 -04:00
ZomgPonies 1be205df11 Shadowpeople update 2015-04-13 01:06:39 -04:00
ZomgPonies 24213e0596 Merge pull request #795 from tigercat2000/ANTAGlogs
Add check for antags in msg_admin_attack
2015-04-12 23:58:11 -04:00
Fox-McCloud 28f0910ee6 [Goonchem] CLF3 Fixup 2015-04-12 21:42:27 -04:00
DZD 00035a51f0 It compiles!
- Makes shadowlings compile, require snowflaking of a few things to the
human Life() proc due to how Bay species works.
- Renames monkeyizing var to notransform, as that's effectively what it
was used for, to prevent transformation. (/tg/ port)
2015-04-12 19:54:45 -04:00
DZD 0ab3a54fcb Copy-Paste Port of /tg/station's Shadowlings
Ports tgstation/-tg-station#8157

This won't compile, needs to be bugfixed and tested. The only reason I
am PRing  this right now is so that we don't have multiple people
working on the same thing.

@ZomgPonies This will require PROBABILITY SHADOWLING # to be added to
game_options.txt, and will likely require SQL database additions for the
BE_SHADOWLING antag preference.
2015-04-12 13:15:40 -04:00
Tigercat2000 29c59bd51b Add check for antags in msg_admin_attack
This commit first adds a new helper proc labeled isAntag(), as well as
adding a check for antags for every instance of msg_admin_attack().

Goals of this commit:
 - Make admin ATTACK: logs indicate if attacker is an antagonist.

Note; High probability of merge conflicts, 47 files changed.
2015-04-12 08:41:53 -07:00
Fox-McCloud ea66b972ff Merge remote-tracking branch 'upstream/master' into smoke-fix 2015-04-12 04:53:04 -04:00
Fox-McCloud ff0f29c5e5 Chainsaws 2015-04-12 04:47:17 -04:00
ZomgPonies a2830a6ce2 Merge pull request #787 from tigercat2000/ProceduralMap
Procedural Map Generator System (Port from -tg-)
2015-04-12 04:36:43 -04:00
ZomgPonies c922b1229b Merge pull request #786 from Fox-McCloud/brain-damage
Universal Brain Damage
2015-04-12 04:35:59 -04:00
ZomgPonies efc1bdef21 Merge pull request #785 from Fox-McCloud/telearmor
Buffs Reactive Tele-Armor
2015-04-12 04:35:50 -04:00
ZomgPonies 234d4ae23a Merge pull request #784 from Fox-McCloud/fuckyougit
[Goonchem] Improvised Heating
2015-04-12 04:35:42 -04:00
ZomgPonies f7d8df5aef Merge pull request #777 from Fox-McCloud/foods
[Goonchem] Food Reagents
2015-04-12 04:35:14 -04:00
Spacemanspark bb8dadb56b Squishing commits 2015-04-11 14:46:15 -05:00