Commit Graph

22199 Commits

Author SHA1 Message Date
Fox-McCloud
d250e38067 Merge pull request #811 from Artorp/electricchair
Electric Chair update
2015-04-16 00:20:10 -04: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
796695a56b Makes glass tables smash when someone is tabled
This commit does the following:
 - Fixes a minor spelling mistake.

 - Moves glass tables breaking into a proc, was messy otherwise.

 - Changes grab-smash behavior. 'Tabling' someone will now smash the
   glass table, and weaken them for about the same length as a baton.
2015-04-15 12:59:31 -07: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
Fox-McCloud
e931cdf000 Merge pull request #808 from tigercat2000/Eyecheck
Ports "Improved eyecheck()" from -tg-
2015-04-15 01:11:46 -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
Fox-McCloud
87027d136e Merge pull request #805 from tigercat2000/GlassTables
Glass tables!
2015-04-14 18:23:00 -04: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
Artorp
1061bddc35 Added electric chair to map 2015-04-14 23:50:55 +02:00
Artorp
949a6349a2 Electric Chair update
- Changed toggle verb into activation verb
- Added support for spawned/mapplaced e-chairs
- Fixed activation animation
- Fixed updating of icon
- Buffed damage, victim will die much quicker
- Removed stun
2015-04-14 21:36:22 +02: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
DZD
6d10960884 Minor fixes
- Mutetoxin does not exist, replaced with Capulettium Plus in
Shadowling's Glare
- Makes chrysalis walls actually have sprites.
2015-04-13 17:59:53 -04: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
Tigercat2000
acc3755a98 Adds glass tables, glass table frames
This commit adds glass tables (credit to WalterJe of -tg-'s fourms for
the sprites) to the game. These can be constructed with two metal
sheets, and two glass sheets. Flipping the table causes it to shatter
and deconstruct itself. You can deconstruct the table at any stage
with a wrench.
2015-04-13 06:29:05 -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
ZomgPonies
986d0a667c Merge pull request #797 from fj45/master
Very Minor Wall Med Change-Engie and Cargo
2015-04-12 23:58:01 -04:00
ZomgPonies
7296cdb0d7 Merge pull request #799 from Fox-McCloud/CLF3-Tweak
[Goonchem] CLF3 Fixup
2015-04-12 23:57:28 -04:00
ZomgPonies
baee5f14e1 Merge pull request #798 from JJRcop/patch-1
Removes Chrono_Legionairre.dmi
2015-04-12 23:57:14 -04:00
Fox-McCloud
28f0910ee6 [Goonchem] CLF3 Fixup 2015-04-12 21:42:27 -04:00
Fox-McCloud
d04b9ad0de tweak 2015-04-12 19:57: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
JJRcop
30a1dcabef Removes Chrono_Legionairre.dmi
When I made the Chronosuit and TED I made this file so I could easily move around the sprites to their respective files after I was done making all the necessary modifications. I mistakenly committed it and blah blah it's useless. I removed it in tgstation/-tg-station#8275, but since you ported it in #250 I figured I'd remove it here too because nobody needs useless files, right?
2015-04-12 19:17:46 -04:00
fj45
13252ce1a8 Very Minor Wall Med Change-Engie and Cargo
Added a wall med to cargo.
Moved one of the wall meds in engineering to a spot accessible by atmos
techs.
2015-04-13 06:50:00 +08: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
421c27b4e4 chainsaw fixups 2015-04-12 07:44:11 -04:00
ZomgPonies
dfaad7168d Merge pull request #782 from Fox-McCloud/smoke-fix
[Goonchem] Smoke Fix
2015-04-12 05:38:26 -04: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