Commit Graph

9220 Commits

Author SHA1 Message Date
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
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
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
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
Fox-McCloud
aaf3be77fb New Vending Machines 2015-04-13 03:27:41 -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
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
Tigercat2000
f3dd9d5e82 Fix runtime error with handle_heartbeat()
Fixes this runtime error:
//-------------------------------------------------\\
|| runtime error: Cannot read null.status          ||
|| proc name: handle heartbeat                     ||
|| (/mob/living/carbon/human/proc/handle_heartbeat)||
|| source file: life.dm,1648                       ||
\\-------------------------------------------------//

This was caused by no sanity check to make sure that
internal_organs_by_name actually returned an organ, therefore it was
attempting to read a null variable, which causes a runtime error.
2015-04-11 11:43:35 -07:00
Remie Richards
0f7b09ef07 Procedural Map Generator System
This commit adds a Procedural map generating system for code and admins to
use ingame. The system is modular, which means that it is fairly easy to
make new generating systems. Currently, only the 'nature' unsimulated
system is implemented, as a testing verb for admins to use. Admins can
define the starting XYZ and ending XYZ of the generated system.

Players - This means you may see content that is truely random, in the
future.

Coders - This system allows you to randomize map elements. Writing new
modules is documented at
code/modules/procedural-mapping/mapGeneratorReadme.dm
Detailed information about how the system works, and how it can be
integrated is also avalible there.

Admins - This system will allow you to, at the touch of a button, create
very complex structures and turfs that would otherwise require being
spawned in manually, one by one. The nature button is a fairly good
example of this, with it's randomized grass textures, randomly placed
trees, and randomly placed rocks. This would normally take a good 5
minutes to do, spawning the trees and rocks and turfs, but it takes about
20 seconds to enter the coordinates and have it be completely random.
2015-04-11 05:28:10 -07:00
Fox-McCloud
6507ddb674 Universal Brain Damage 2015-04-11 05:44:06 -04:00
Fox-McCloud
718ad57231 Buffs Reactive Tele-Armor 2015-04-11 03:33:49 -04:00
Fox-McCloud
4908b10dbf [Goonchem] Improvised Heating 2015-04-10 22:44:15 -04:00
Fox-McCloud
55ccddd6c0 [Goonchem] Smoke Fix 2015-04-10 20:30:33 -04:00
Fox-McCloud
51db1854c7 Merge pull request #780 from tigercat2000/WormExceptions
Add spaceworms to /obj/effect/tear exception list
2015-04-10 19:33:38 -04:00
Tigercat2000
2729ade288 Add spaceworms to /obj/effect/tear exception list
This commit adds /mob/living/simple_animal/hostile/spaceWorm to the
obj/effect/tear blocked mobs list, to prevent /obj/effect/tear from
spawning them.
2015-04-10 11:13:18 -07:00
Fox-McCloud
ea9cb6803f forgot 2015-04-10 07:36:38 -04:00
Fox-McCloud
14ea26fdf8 fixes 2015-04-10 07:10:06 -04:00
Fox-McCloud
286a1ad5df [Goonchem] Food Reagents 2015-04-10 04:46:50 -04:00
FalseIncarnate
8d97c056ca Custom Items - Theoricus
Adds in their custom jumpsuit, coat, and shoes.
2015-04-10 03:39:18 -04:00
ZomgPonies
e3050f5cc1 Merge pull request #771 from Fox-McCloud/nukies
Nukies--Chemsprayer and New Grenades
2015-04-09 16:22:19 -04:00
ZomgPonies
9995539d4e Merge pull request #769 from tigercat2000/trackinpods
Spacepod tracking devices
2015-04-09 16:21:05 -04:00
ZomgPonies
0f2e70aa5c Merge pull request #762 from Fox-McCloud/acid
[Goonchem] Acid Rework
2015-04-09 16:20:48 -04:00
ZomgPonies
68c20e32f7 Merge pull request #759 from Fox-McCloud/temperature
[Goonchem] Reagent Temperatures
2015-04-09 16:20:38 -04:00
Fox-McCloud
b8230aefe6 Nukies--Chemsprayer and New Grenades 2015-04-08 23:39:07 -04:00
Fox-McCloud
993529a2b1 tweaking 2015-04-08 19:54:19 -04:00