mwerezak and ZomgPonies
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 and ZomgPonies
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 and ZomgPonies
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 and ZomgPonies
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 and ZomgPonies
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 and ZomgPonies
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
JimTheCactus and ZomgPonies
24a423776d
Fixed not-quite-blank field issues in the various record keeping computers.
...
Added trim to most fields in Medical Computer
Added trim to most fields in Staff Computer
Added name verification in Staff Computer
Added trim to most fields in Security Computer
Added name verification in Security Computer
Conflicts:
code/game/machinery/computer/medical.dm
code/game/machinery/computer/security.dm
2014-07-16 09:34:52 -04:00
Neerti and ZomgPonies
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
e77ebbb15a
Moar spell icons
2014-07-16 08:58:22 -04:00
ZomgPonies
dfb9a40e72
Template fixes
2014-07-16 03:08:34 -04:00
ZomgPonies
1fe2cefe5f
PDA nanoUI fix
2014-07-16 03:06:19 -04:00
ZomgPonies
5bd725af44
More work on spell action buttons.
2014-07-16 02:48:54 -04:00
ZomgPonies
2d31bfa01d
Removing disease1/virus1 from repo
2014-07-16 02:00:32 -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
ZomgPonies
9251079c95
Merge pull request #293 from VampyrBytes/master
...
Fixes #236
2014-07-15 22:52:31 -04:00
ZomgPonies
bc6b981370
Merge pull request #292 from Regen1/Small-changes
...
Tajaran suit fix
2014-07-15 22:51:34 -04:00
mwerezak and ZomgPonies
3aaff9126d
Doors now retry if they fail to complete commands
2014-07-15 11:21:13 -04:00
mwerezak and ZomgPonies
25c2fb2519
Moves misplaced var from airlock_control.dm
...
Moved explosion_resistance from airlock_control.dm to airlock.dm proper.
2014-07-15 11:21:00 -04:00
ZomgPonies
ccb425bd44
Preperation for spell action buttons
2014-07-15 11:20:43 -04:00
ZomgPonies
fa8ed8a5b1
Gave more slots for dynamic object action buttons
2014-07-15 09:30:36 -04:00
ZomgPonies
4bfb46037f
Moar Object verb removal/switch to right-click
2014-07-15 09:18:37 -04:00
ZomgPonies
88098da3c7
Object verb removal crew
2014-07-15 08:47:43 -04:00
mwerezak and ZomgPonies
9dff861f7d
Fixes webbing and holsters shielding EMP
2014-07-15 07:34:33 -04:00
Mark Aherne and ZomgPonies
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 and ZomgPonies
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 and ZomgPonies
92ac2f4568
Correct pregame_timeleft from my debug value 20 to production value 180.
2014-07-15 07:25:42 -04:00
Mark Aherne and ZomgPonies
292615bc4e
Remove testing debug messages from nanomanager.
...
Conflicts:
code/modules/nano/nanomanager.dm
2014-07-15 07:25:20 -04:00
Mark Aherne and ZomgPonies
8cbb71eba6
Continued work in progress on a major revision of the NanoUI templating system.
2014-07-15 07:23:01 -04:00
Mark Aherne and ZomgPonies
07ad088661
Added some spacing between mode sections on the PDA template.
2014-07-15 07:22:46 -04:00
Mark Aherne and ZomgPonies
3c8aa493c6
Reformatted the PDA template as it was a mess.
2014-07-15 07:22:33 -04:00
Mark Aherne and ZomgPonies
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 and ZomgPonies
4b4f85c22e
Work in progress on a major revision of the NanoUI templating system.
2014-07-15 07:10:57 -04:00
Mark Aherne and ZomgPonies
fc1d61ac98
Work in progress on a major revision of the NanoUI templating system.
2014-07-15 07:10:46 -04:00
Mark Aherne and ZomgPonies
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
db81cc5133
Fix all the overlays with the new view range. 544 x 544 is the new 480
2014-07-15 06:49:23 -04:00
ZomgPonies
3067d75891
Big UI changes in preparation with campaign to remove Objects tab
2014-07-15 04:59:24 -04:00
ZomgPonies
1eb02b5cf4
Overhauled holsters and webbings
2014-07-15 04:02:24 -04:00
Kelenius and ZomgPonies
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
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
9ed850c40f
Missing beach sprites from forever ago
2014-07-14 07:49:15 -04:00
Whitellama and ZomgPonies
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 and ZomgPonies
fd3ecfd829
Fixes #5563
2014-07-14 03:33:42 -04:00
Zuhayr and ZomgPonies
938dc70803
Fixes #5485
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2014-07-14 03:31:51 -04:00
Zuhayr and ZomgPonies
4bda0095ca
Fixes #5531
2014-07-14 03:27:15 -04:00
Zuhayr and ZomgPonies
9d3d1c9ea1
Fixes #5508
...
Conflicts:
code/modules/organs/organ_external.dm
2014-07-14 03:26:56 -04:00
Zuhayr and ZomgPonies
6b08fa875a
Fixes #5608
...
Conflicts:
code/modules/mining/machine_processing.dm
2014-07-14 03:25:02 -04:00
Zuhayr and ZomgPonies
c91d3895f9
Fixes #5573
2014-07-14 03:23:53 -04:00
Zuhayr and ZomgPonies
50e87a8c1f
Fixes #5600
2014-07-14 03:23:04 -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
