Commit Graph

7765 Commits

Author SHA1 Message Date
ZomgPonies
58803b7b83 New positive random event, yay 2014-07-17 15:28:09 -04:00
d3athrow
6a4866e199 Fix POS not opening the menu when you slap with your ID and make it not show the [user] attacked the thing with your ID as well. 2014-07-17 05:38:43 -04:00
ZomgPonies
c654029821 New genetic defects MUAHAHAHAA 2014-07-17 05:36:30 -04:00
Heredth
ded49a5af9 Update whisper.dm
Conflicts:
	code/modules/mob/living/carbon/human/whisper.dm
2014-07-17 05:29:17 -04:00
d3athrow
994a5bebbf Fix admins having to toggle genes several fucking times to get them to turn on sometimes.
Fix adminbus toggling genes on to cause all other genes to manifest - added genemutcheck proc and domutation proc to handle the changes.
Added a global list of gene datums that match the order of the randomized blocks in genetics to allow for easy lookup based on blocks and allows single gene checking to work.

Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/admin/verbs/debug.dm
2014-07-17 05:27:05 -04:00
ZomgPonies
81c643924d Icons for most genetic powers. 2014-07-17 02:57:36 -04:00
ZomgPonies
a76f51b479 Merge pull request #296 from mwerezak/paradise-docking
Updates docking controllers
2014-07-17 01:36:28 -04:00
ZomgPonies
371fd82f54 Merge pull request #294 from VampyrBytes/master
Replaced Monkeyized() with working method
2014-07-17 01:35:32 -04:00
mwerezak
3e12d5028c Fixes wrong circuit board in labor shuttle console 2014-07-17 00:40:16 -04:00
mwerezak
7823403456 Updates docking controllers
Fixed centcom and admin shuttles missing centcom side docking
controllers. Adds prison and gamma shuttle docking controllers. Adds
escape shuttle docking controllers. Adds escape pod docking controllers.
2014-07-17 00:33:49 -04:00
MrPerson
7a554f2be9 Make dead people stop jittering
Fixes #3690
2014-07-16 16:47:22 -04:00
JimTheCactus
b96429146e Fixes #5640 Make sparks effect target mob, not organ
The malfunction sparks were calling to a var src, which in most other places is the main object itself, here that's the organ and it doesn't have a loc. Changed it to call the organ's owner.
2014-07-16 10:12:03 -04:00
mwerezak
0b61e8e646 Limits hearing sounds in a vacuum
Conflicts:
	code/modules/mob/living/say.dm
2014-07-16 10:09:51 -04:00
mwerezak
9af839f34b Thrown sharp objects no longer always embed 2014-07-16 10:06:40 -04:00
mwerezak
8644045eac Moves human specific hitby code to human_defense
Conflicts:
	code/modules/mob/living/living_defense.dm
2014-07-16 10:06:22 -04:00
mwerezak
b36ce010ad Bad indentation causing robot modules to embed
Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
2014-07-16 10:04:34 -04:00
mwerezak
be448d9c73 Thrown momentum no longer depends on fingerprints
Conflicts:
	code/modules/mob/living/living_defense.dm
2014-07-16 09:56:00 -04:00
mwerezak
a07b7a5ce3 Thrown items can be targeted, has miss chance...
...based on distance, similar to projectiles.

Conflicts:
	code/defines/obj.dm
	code/game/machinery/kitchen/smartfridge.dm
	code/game/machinery/vending.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/modules/games/cards.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living_defense.dm
2014-07-16 09:53:34 -04:00
mwerezak
ee3b362f8e Adds miss chance and shield checks to thrown atoms
Also makes setting a thrown atom's throwing var the responsibility of
the handler, so that impact handling code can decide if the thrown atom
should keep on going.

Conflicts:
	code/game/atoms.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/living_defense.dm
2014-07-16 09:42:11 -04:00
mwerezak
da7ae3c049 Moves turf collision handling into living_defense
Conflicts:
	code/modules/mob/living/living_defense.dm
2014-07-16 09:38:36 -04:00
mwerezak
5760510183 Fixes melee attacks using area effect armour values
def_zone is normally not set when attacking with a melee weapon, and the
melee armour check didn't use target_zone for some reason.
2014-07-16 09:37:11 -04:00
mwerezak
e2b4e43a9c Fixes suits being punctured by projectiles when...
...fully blocked by a shield.

Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
2014-07-16 09:36:50 -04:00
mwerezak
4803dfa063 Fixes organs not being removed due to damage
Because the dismemberment check was being done before brute_dam was
updated, the attack that actually brought brute_dam above the threshold
would not be able to pass the check, regardless of how much damage was
actually done.
2014-07-16 09:35:33 -04:00
Neerti
dd6f54ed47 fun fact: This took 6 hours because bay uses different say().
fun fact: I'm never porting say-related stuff from bay.

Conflicts:
	code/game/objects/items/devices/radio/encryptionkey.dm
	code/game/objects/items/devices/radio/headset.dm
	code/modules/mob/living/say.dm
	code/modules/mob/living/silicon/ai/ai.dm
2014-07-16 09:27:12 -04:00
ZomgPonies
aafa11712a Removal of virus1/disease1 system. So long GBS/Jungle Fever, you'll be missed! 2014-07-16 00:53:08 -04:00
VampyrBytes
3ea5e2dda5 Replaced Monkeyized() with working method
commented out old monkeyized() that was causing the ghosting problems
and put a new one in that sends it through the safe method of
monkeyizing. Tested with all currently used monkeyize() calls so won't
break stuff
2014-07-15 15:32:37 +01:00
VampyrBytes
d8bb31c2f8 Fixes #236
Fixes genetic side effect monkeys being turned human, and some of the
dna2 procs that weren't working properly because of some bad defines
2014-07-14 19:24:09 +01:00
ZomgPonies
ccb425bd44 Preperation for spell action buttons 2014-07-15 11:20:43 -04:00
ZomgPonies
88098da3c7 Object verb removal crew 2014-07-15 08:47:43 -04:00
mwerezak
9dff861f7d Fixes webbing and holsters shielding EMP 2014-07-15 07:34:33 -04:00
Mark Aherne
17aafd91e4 Layout update for NanoUI.
The layout HTML (which was mainly used for the title bar) is no longer hard coded in nanoui.dm.
Layouts are now dynamic and each consists of a template and stylesheet (CSS) file.
Multiple layouts can exist, they can be switched to using the set_layout_key proc. See the proc comments for more info.
Added "default" and "basic" layouts, "basic" has no title bar.
Moved image source assets (GIMP and Flash files) into a separate source folder so that they are not sent to the client.

Conflicts:
	code/modules/nano/nanoui.dm
2014-07-15 07:30:37 -04:00
Mark Aherne
d97aa66947 Fixed comments for new JS files in nanoui.dm.
Changed the BYOND cache path in "To BYOND Cache.bat" to a dynamic path.

Conflicts:
	code/modules/nano/nanoui.dm
2014-07-15 07:27:15 -04:00
Mark Aherne
292615bc4e Remove testing debug messages from nanomanager.
Conflicts:
	code/modules/nano/nanomanager.dm
2014-07-15 07:25:20 -04:00
Mark Aherne
8cbb71eba6 Continued work in progress on a major revision of the NanoUI templating system. 2014-07-15 07:23:01 -04:00
Mark Aherne
9b45dbabfb Continued work in progress on a major revision of the NanoUI templating system.
Conflicts:
	code/ATMOSPHERICS/components/omni_devices/filter.dm
	code/ATMOSPHERICS/components/omni_devices/mixer.dm
	code/game/dna/dna_modifier.dm
	code/game/machinery/cryo.dm
	code/game/machinery/kitchen/smartfridge.dm
	code/modules/nano/nanoexternal.dm
	code/modules/nano/nanomanager.dm
	code/modules/nano/nanoui.dm
	code/modules/power/apc.dm
	code/modules/power/smes.dm
	code/modules/reagents/Chemistry-Machinery.dm
	nano/css/shared.css
	nano/js/nano_update.js
	nano/templates/escape_pod_console.tmpl
2014-07-15 07:22:15 -04:00
Mark Aherne
fc1d61ac98 Work in progress on a major revision of the NanoUI templating system. 2014-07-15 07:10:46 -04:00
Mark Aherne
128c310933 Work in progress on a major revision of the NanoUI templating system.
Conflicts:
	nano/js/nano_base_helpers.js
	nano/templates/advanced_airlock_console.tmpl
	nano/templates/door_access_console.tmpl
	nano/templates/escape_pod_console.tmpl
	nano/templates/identification_computer.tmpl
	nano/templates/omni_filter.tmpl
	nano/templates/omni_mixer.tmpl
	nano/templates/pda.tmpl
	nano/templates/simple_docking_console_pod.tmpl
	nano/templates/transfer_valve.tmpl
2014-07-15 07:10:30 -04:00
ZomgPonies
1eb02b5cf4 Overhauled holsters and webbings 2014-07-15 04:02:24 -04:00
Kelenius
c54b9e3626 Slime update
Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/metroid/death.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/say.dm
	code/modules/mob/transform_procs.dm
	code/modules/reagents/Chemistry-Recipes.dm
	maps/tgstation2.dmm
2014-07-15 00:50:41 -04:00
Whitellama
88d4e49efe Fixed issues with cans complaining twice when trying to drink unopened and with transfering fluids between closed cans
Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm
2014-07-14 06:46:38 -04:00
Chinsky
fd3ecfd829 Fixes #5563 2014-07-14 03:33:42 -04:00
Zuhayr
938dc70803 Fixes #5485
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2014-07-14 03:31:51 -04:00
Zuhayr
4bda0095ca Fixes #5531 2014-07-14 03:27:15 -04:00
Zuhayr
9d3d1c9ea1 Fixes #5508
Conflicts:
	code/modules/organs/organ_external.dm
2014-07-14 03:26:56 -04:00
Zuhayr
6b08fa875a Fixes #5608
Conflicts:
	code/modules/mining/machine_processing.dm
2014-07-14 03:25:02 -04:00
Zuhayr
c91d3895f9 Fixes #5573 2014-07-14 03:23:53 -04:00
ZomgPonies
ce04d9551c Added NT Recruiter and Sec Pod Pilot karma jobs 2014-07-13 22:34:06 -04:00
ZomgPonies
726ce88681 WW2 bomber jacket for sec pod pilot. 2014-07-13 22:08:34 -04:00
d3athrow
6a61b78d98 Spacepod enhancements
Added damage to spacepods as well as damage overlays.
Started a framework to allow more than 1 weapon system per spacepod.
Pods turn into fireworks when they reach 0 integrity.

Conflicts:
	code/WorkInProgress/pomf/spacepods/spacepods.dm
	html/changelog.html
2014-07-13 16:05:53 -04:00
ZomgPonies
c1bbd0d51f Moar work on janicart overhaul 2014-07-13 15:52:59 -04:00