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
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
ZomgPonies
2ba308bdb0
Start work in janicart replacement train
2014-07-13 15:52:50 -04:00
Kelenius
a552662bec
Now uses isturf
2014-07-13 15:21:12 -04:00
Kelenius
a0609d0ce7
Two fixes
...
Double click made non-snowflake, cancel camera exploit patched
2014-07-13 15:20:53 -04:00
Kelenius
b6c6138c44
Gives the AI a hud
...
Conflicts:
code/_onclick/hud/_defines.dm
code/_onclick/hud/other_mobs.dm
code/_onclick/hud/screen_objects.dm
code/game/objects/items/devices/PDA/PDA.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/mob/living/silicon/ai/say.dm
code/modules/paperwork/photography.dm
2014-07-13 15:20:08 -04:00
igalan
7940e3d6db
Syntiflesh is defined twice, both as a food/snack and obj/item/weapon. The first one is edible while the second one is not.
...
This PR comments out the non-edible one and replaces any reference of it to the edible one.
Conflicts:
code/defines/obj/weapon.dm
maps/tgstation2.dmm
2014-07-13 09:07:36 -04:00
Walter0o
800169feab
adjusts examine for w_class 1 yankability
...
Conflicts:
code/modules/mob/living/carbon/human/examine.dm
2014-07-13 09:02:33 -04:00
ZomgPonies
b0edf2cc0b
Small fix
2014-07-13 09:01:47 -04:00
Walter0o
e5cb01f6fb
shrapnel check for human get_visible_implants()
2014-07-13 08:59:51 -04:00
Walter0o
f5e1911a2e
fixes #5449
...
missing variable updating lead to APCs stuck in green status during powersinks.
2014-07-13 08:59:25 -04:00
mwerezak
8ad91ea11c
Fixes germ levels going below zero
...
Conflicts:
code/modules/organs/organ_internal.dm
2014-07-13 08:53:53 -04:00
mwerezak
44e2f8acf2
Fixes human internal organs list
...
Conflicts:
code/modules/events/organ_failure.dm
code/modules/organs/blood.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/surgery/ribcage.dm
2014-07-13 08:51:55 -04:00
Zuhayr
1079661a1e
Reapplied scanners to map, stopped braces working on drill turfs with no resources.
...
Conflicts:
maps/tgstation2.dmm
2014-07-13 08:45:03 -04:00
Zuhayr
333c3c8ae7
Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs.
...
Conflicts:
baystation12.dme
code/modules/admin/admin_verbs.dm
maps/tgstation2.dmm
2014-07-13 08:44:47 -04:00
Hubblenaut
956706c7cf
Fix: Painkillers stay in body for decent time
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
2014-07-13 08:34:30 -04:00
Hubblenaut
776369d9ee
Health Analyzer can read all types of beneficial medicine
...
Conflicts:
code/game/objects/items/devices/scanners.dm
code/modules/reagents/Chemistry-Reagents.dm
2014-07-13 08:32:14 -04:00
Chinsky
0df1dabf75
Adds overmap system and examples of it's usage.
...
Unticked, as it disables space edge transition.
Conflicts:
code/modules/mob/mob_movement.dm
2014-07-13 08:21:26 -04:00
mwerezak
76e9212ac8
Fixed wrong operator
2014-07-13 08:19:59 -04:00
mwerezak
2ff4a975f0
Sterilizine reduces germ_level on contact
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
2014-07-13 08:19:50 -04:00
mwerezak
87e7c32959
Fixes advanced trauma kits claiming to disinfect but not doing so
...
Conflicts:
code/game/objects/items/stacks/medical.dm
2014-07-13 08:18:16 -04:00
unknown
9a6e39fc58
Fixes missing length check before pick()
2014-07-13 08:17:03 -04:00
mwerezak
d3cdb25ef3
Increases cough rate for lung infections
2014-07-13 08:16:49 -04:00
mwerezak
ebfbf40724
Tweaks internal organ spread rate
...
Conflicts:
code/modules/organs/organ_internal.dm
2014-07-13 08:16:32 -04:00
mwerezak
afaf623376
Makes minor wounds harder to infect
2014-07-13 08:13:21 -04:00
mwerezak
64ba9ab933
Fixes #5532 and increases the time required for organs to become infected from wounds
...
Also removes the now unnecessary get_cure_threshold() proc, caps the
rate at which an organ can receive germs from wounds, and makes germs
spread from external to internal organs happen one organ at a time
instead of all at once.
Conflicts:
code/modules/organs/organ_internal.dm
code/setup.dm
2014-07-13 08:13:02 -04:00
