Cael_Aislinn
aae42d928a
Merge branch 'incremental_tg' r5200 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/__HELPERS/global_lists.dm
code/__HELPERS/type2type.dm
code/__HELPERS/unsorted.dm
code/datums/datumvars.dm
code/datums/disease.dm
code/datums/organs/organ_external.dm
code/datums/supplypacks.dm
code/defines/obj.dm
code/game/area/areas.dm
code/game/atoms.dm
code/game/gamemodes/cult/cult_structures.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/events.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/gamemodes/events/space_ninja.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/gameticker.dm
code/game/hud.dm
code/game/jobs/access.dm
code/game/jobs/job/civilian.dm
code/game/machinery/alarm.dm
code/game/machinery/cloning.dm
code/game/machinery/computer/cloning.dm
code/game/machinery/computer/medical.dm
code/game/machinery/computer/syndicate_shuttle.dm
code/game/machinery/telecomms/broadcaster.dm
code/game/machinery/telecomms/machine_interactions.dm
code/game/objects/effects/decals/contraband.dm
code/game/objects/effects/signs.dm
code/game/objects/items/devices/PDA/PDA.dm
code/game/objects/items/devices/PDA/cart.dm
code/game/objects/items/weapons/photography.dm
code/game/objects/structures/door_assembly.dm
code/game/objects/structures/window.dm
code/game/sound.dm
code/game/verbs/ooc.dm
code/global.dm
code/modules/DetectiveWork/detective_work.dm
code/modules/DetectiveWork/evidence.dm
code/modules/DetectiveWork/footprints_and_rag.dm
code/modules/DetectiveWork/scanner.dm
code/modules/admin/player_panel.dm
code/modules/admin/verbs/adminhelp.dm
code/modules/admin/verbs/adminpm.dm
code/modules/awaymissions/gateway.dm
code/modules/client/client defines.dm
code/modules/client/client procs.dm
code/modules/client/preferences.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/mining/machine_processing.dm
code/modules/mining/machine_stacking.dm
code/modules/mining/mint.dm
code/modules/mining/ores_coins.dm
code/modules/mining/satchel_ore_boxdm.dm
code/modules/mob/living/carbon/alien/alien.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/carbon_defines.dm
code/modules/mob/living/carbon/human/human_damage.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/living.dm
code/modules/mob/living/say.dm
code/modules/mob/mob.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/mob_defines.dm
code/modules/mob/mob_transformation_simple.dm
code/modules/mob/new_player/login.dm
code/modules/mob/new_player/new_player.dm
code/modules/mob/new_player/preferences_setup.dm
code/modules/mob/new_player/savefile.dm
code/modules/mob/new_player/sprite_accessories.dm
code/modules/paperwork/folders.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/photocopier.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/setup.dm
code/unused/mining/datum_processing_recipe.dm
code/unused/powerarmor/powerarmor.dm
code/world.dm
html/changelog.html
icons/effects/96x96.dmi
icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
icons/obj/hydroponics.dmi
icons/obj/items.dmi
icons/turf/areas.dmi
icons/turf/walls.dmi
maps/RandomZLevels/fileList.txt
maps/RandomZLevels/spacebattle.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-07 00:23:22 +10:00
Cael_Aislinn
c0102cf13e
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/defines/procs/global_lists.dm
code/game/gamemodes/events.dm
code/game/gamemodes/events/space_ninja.dm
code/game/mecha/working/ripley.dm
code/modules/mob/living/carbon/human/human_attackalien.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/new_player/preferences.dm
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/mask.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-29 13:06:03 +10:00
Cael_Aislinn
31349fb7d3
Merge branch 'incremental_tg' r5067 into bs12_with_tgport
...
removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates)
Conflicts:
baystation12.dme
code/__HELPERS/type2type.dm
code/controllers/configuration.dm
code/datums/datumvars.dm
code/datums/helper_datums/getrev.dm
code/defines/obj.dm
code/game/gamemodes/events/black_hole.dm
code/game/gamemodes/events/space_ninja.dm
code/game/gamemodes/wizard/rightandwrong.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/job.dm
code/game/jobs/job_controller.dm
code/game/machinery/bots/medbot.dm
code/game/machinery/computer/card.dm
code/game/machinery/telecomms/traffic_control.dm
code/game/machinery/turrets.dm
code/game/machinery/wishgranter.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/devices/uplinks.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/turfs/turf.dm
code/game/verbs/ooc.dm
code/global.dm
code/modules/admin/IsBanned.dm
code/modules/admin/admin.dm
code/modules/admin/admin_memo.dm
code/modules/admin/admin_verbs.dm
code/modules/admin/holder2.dm
code/modules/admin/player_panel.dm
code/modules/admin/verbs/adminpm.dm
code/modules/admin/verbs/diagnostics.dm
code/modules/assembly/igniter.dm
code/modules/client/client defines.dm
code/modules/client/client procs.dm
code/modules/clothing/spacesuits/miscellaneous.dm
code/modules/clothing/suits/armor.dm
code/modules/clothing/suits/jobs.dm
code/modules/mining/mine_turfs.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/living.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/new_player/new_player.dm
code/modules/mob/new_player/preferences.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/photocopier.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/modules/reagents/Chemistry-Machinery.dm
code/setup.dm
code/stylesheet.dm
code/world.dm
config/admins.txt
config/config.txt
html/changelog.html
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/suit.dmi
icons/obj/clothing/suits.dmi
icons/turf/areas.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-28 14:13:11 +10:00
Cael_Aislinn
e6c70937e5
Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/__HELPERS/game.dm
code/__HELPERS/type2type.dm
code/datums/helper_datums/getrev.dm
code/game/atoms.dm
code/game/gamemodes/events.dm
code/game/machinery/atmo_control.dm
code/game/machinery/atmoalter/area_atmos_computer.dm
code/game/machinery/computer/HolodeckControl.dm
code/game/machinery/computer/atmos_alert.dm
code/game/machinery/computer/card.dm
code/game/machinery/computer/cloning.dm
code/game/machinery/computer/computer.dm
code/game/machinery/computer/pod.dm
code/game/machinery/computer/prisoner.dm
code/game/machinery/computer/syndicate_shuttle.dm
code/game/machinery/newscaster.dm
code/game/machinery/spaceheater.dm
code/game/machinery/telecomms/broadcaster.dm
code/game/machinery/telecomms/logbrowser.dm
code/game/machinery/telecomms/machine_interactions.dm
code/game/machinery/telecomms/telemonitor.dm
code/game/machinery/telecomms/traffic_control.dm
code/game/machinery/wishgranter.dm
code/game/objects/items/devices/uplinks.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/objs.dm
code/modules/DetectiveWork/detective_work.dm
code/modules/admin/IsBanned.dm
code/modules/admin/admin.dm
code/modules/admin/verbs/adminsay.dm
code/modules/admin/verbs/getlogs.dm
code/modules/awaymissions/zlevel.dm
code/modules/client/client procs.dm
code/modules/clothing/masks/miscellaneous.dm
code/modules/clothing/spacesuits/miscellaneous.dm
code/modules/flufftext/TextFilters.dm
code/modules/mining/machine_processing.dm
code/modules/mining/machine_stacking.dm
code/modules/mining/mine_items.dm
code/modules/mining/mint.dm
code/modules/mining/satchel_ore_boxdm.dm
code/modules/mob/living/carbon/monkey/life.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
code/modules/mob/mob.dm
code/modules/paperwork/filingcabinet.dm
code/modules/paperwork/photocopier.dm
code/modules/power/gravitygenerator.dm
html/changelog.html
icons/mob/head.dmi
icons/mob/human_face.dmi
icons/mob/mask.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/masks.dmi
icons/obj/clothing/suits.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-28 01:07:36 +10:00
cib
39b12b280a
Fixed a few problems with PDA crew manifest.
2012-12-24 21:13:29 +01:00
cib
6da98a0c00
Everyone now has crew manifest, and it uses the good version on PDA's.
2012-12-24 20:50:20 +01:00
SweeperM
b8a12b0b52
Fixes to lighting
...
-Fixed #2005 (for sure!)
-Fixed the stacking of brightness. Now the most bright item turned ON will be the one where the user gets its luminosity of.
-Cleaned the code a bit. Now only one var controls the on/off switch of light, and another holds the value of brightness when on.
2012-11-29 23:01:51 +00:00
johnsonmt88@gmail.com
8ae9dfd947
Removed the MASKINTERNALS from /obj/item/clothing/mask flags. There is no reason for -every- mask to act as internals.
...
Added an issilicon() check to the PDA's remove id/pen verbs so that the AI can no longer be rendered helpless if they happen to click the 'Remove Pen' verb. Fixes issue 1124.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5186 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 04:01:54 +00:00
johnsonmt88@gmail.com
4ddf9100f5
Sending a message should no longer work if you are incapacitated. Fixes issue 1120.
...
Moved some mob vars to carbon:
mob/var/handcuffed -> mob/living/carbon/var/handcuffed
mob/var/legcuffed -> mob/living/carbon/var/legcuffed
As a result, I've turned some procs into pure virtual procs and moved their code into carbon.dm.
mob/proc/restrained() -> mob/living/carbon/restrained()
mob/proc/can_use_hands() -> mob/living/carbon/can_use_hands()
The hand and legcuff portion of mob/proc/u_equip() was moved into mob/living/carbon/u_equip().
The handcuffed portion of mob/proc/show_inv() was moved into mob/living/carbon/show_inv().
Fixes issue 1114.
Made parrots immune to bear traps since parrots should be flying over them anyway.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5184 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 00:28:47 +00:00
giacomand@gmail.com
f1d24f27f9
Simplified Detective.
...
-Changed the focus from the high-res scanner to the regular scanner. It will simply scan the fingerprints and display them to the detective. For extra functionality, it'll store it's findings in a log and then you can print it out in a report by using attack_self().
-Detectives can now use the medical computer.
-Removed the pda forensic scanning functionality.
-Got rid of now useless high-res scanner computer. Got rid of the now useless fingerprint cards.
-Added a medical computer to the detective's office and replaced the useless medical cabinet with an empty one.
Other
-Got rid of diseases magically moving down a stage.
-Optimized playsound()
-Added an attack_self() to sprayers so that you can change the reagent use of them between 5 and 10.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5168 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-23 00:39:18 +00:00
petethegoat@gmail.com
06ef565d4d
Some runtime fixes for the med data computer and hopefully the mule cart.
...
Fixes issue 526. MMI-Mech issues
MMIs can now change intent. There's no feedback, but they can at least function properly now in mechs.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5098 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-17 17:44:29 +00:00
elly1989@rocketmail.com
5ba2a398a1
Removed an extra "cartridge = C" that accidentally got left in
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5084 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-16 02:14:24 +00:00
elly1989@rocketmail.com
25b61bae72
Removed the infra_sensor define for noddie.
...
Integrated the sql and standard admin_rank stuff a little. Still needs some work.
Permissions Panel has a sexy floating search bar. The scripts and stylesheets are external files which will be sent to every client at connect, so they can be used in any panel you wish with no additional overheads.
If there are any bugs with the permissions panel (particularly the search bar) please let me know. thanks.
rights2text now has a seperator argument. It defaults to "", but can be any string, for instance "<br>"
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5080 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-15 20:35:37 +00:00
d_h2005@yahoo.com
15e001d19d
New sprites for electropacks. Readds transparent-case PDAs.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5067 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-14 22:22:22 +00:00
Ispil
814a670572
Fix to issue #1887 .
2012-11-12 12:29:55 -07:00
Hawk-v3
3cfb201846
Merge pull request #1839 from AterIgnis/ed209
...
ED209 not showing on remote-control chip of security PDA
2012-11-09 07:42:09 -08:00
SkyMarshal
9b3389145e
Fixed some runtimes with mulebots, the security computer, and the medical computer, as well as readded the nice prompt the cloner gives to ghosts when they are being cloned. Fixed an odd compile error.
2012-11-08 14:49:01 -07:00
Chinsky
ef6d50b5c4
Added logging of status screen text change.
2012-11-08 15:44:34 +04:00
elly1989@rocketmail.com
4d9876fd65
Fixes issues with pen bbcode. Replacetext did not work correctly after I changed text2list - (It was missing 'needles' at the beginning of 'haystacks').
...
>dd_replacetext and dd_replacetext_case are now replacetext and replacetextEx respectively.
>replacetext and replacetextEx works using strings only; it doesn't convert it into a list and then back into a string.
Fixes some dumb-dumbs in textlist and text2listEx
> "<" where there should be a "<="
> no else case for when the separator is longer than the text (causing empty lists to be returned)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4971 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 21:21:17 +00:00
Ater Ignis
d17f1adfab
ED-209 is a security bot, but not Beepski, do not check for ED being Beepski and 'bang' - it appears on security pda as expected
2012-10-26 15:51:36 +04:00
giacomand@gmail.com
6a2d78bc94
-Killed the updateDialog lag. I added a check to see if there were any mobs to update, if not it will stop checking until a user uses the machine again. I had to replace all the machine = src and machine = null with procs to help make it manageable. I believe this is one of the culprits causing the server to lag as the round goes on, as more players will interact with machines.
...
-Atmos delay is now based on active players, to help fight lag for massive player rounds.
-Changed some for(blah in world) loops to use the correct lists.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4958 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-25 19:15:51 +00:00
Chinsky
7ae59ba6f7
Slapped a few nullchecks near reported runtimes.
2012-10-21 16:41:44 +04:00
cib
5ef6399238
Fixed a ton of the issues in http://piratepad.net/9CwFobI4lZ
2012-10-12 13:58:18 -07:00
Mloc
33a3d3cd97
Merge pull request #1738 from CIB/master
...
Dismemberment
2012-10-12 09:42:31 -07:00
Cael_Aislinn
419247adfe
Merge remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/game/verbs/ooc.dm
code/modules/admin/admin_verbs.dm
code/modules/food/recipes_microwave.dm
html/changelog.html
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-12 17:53:17 +10:00
cib
fb60301594
Revert "Revert's cib's BS12 merge by XSI's orders"
...
This reverts commit a6e7c085ef
2012-10-11 14:31:31 -07:00
Kortgstation@gmail.com
67433021a1
Combined the PDA constructor things. My bad.
...
Replaced all the for mob in range show in Syndicate.dm etc with visible_message.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4840 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-09 19:42:57 +00:00
Cael_Aislinn
cccff0881f
Merge remote-tracking branch 'remotes/git-svn' tgstation r4838 into bs12_with_tgport
...
Conflicts:
code/game/gamemodes/events.dm
code/game/gamemodes/events/space_ninja.dm
code/game/machinery/atmo_control.dm
code/game/machinery/doors/firedoor.dm
code/game/machinery/telecomms/broadcaster.dm
code/game/objects/structures/watercloset.dm
code/modules/clothing/glasses/glasses.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/simple_animal/life.dm
code/modules/mob/new_player/new_player.dm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-09 23:07:41 +10:00
Kortgstation@gmail.com
f8aaa0104f
Pens no longer spawn in your pocket, rather a pen will spawn in your PDA.
...
Updated the changelog.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4835 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-09 01:37:15 +00:00
Cael_Aislinn
6bd0e536bd
Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
...
Conflicts:
code/ATMOSPHERICS/pipes.dm
code/datums/organs/organ_external.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/gamemodes/events.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/hud.dm
code/game/jobs/job/captain.dm
code/game/machinery/atmoalter/area_atmos_computer.dm
code/game/machinery/recharger.dm
code/game/objects/hud.dm
code/game/turfs/turf.dm
code/modules/client/client defines.dm
code/modules/clothing/head/misc.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/clothing/under/miscellaneous.dm
code/modules/mob/living/carbon/alien/humanoid/hud.dm
code/modules/mob/living/carbon/human/hud.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/carbon/monkey/hud.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/mob_defines.dm
code/modules/mob/mob_helpers.dm
code/modules/mob/mob_movement.dm
code/modules/mob/screen.dm
code/modules/paperwork/filingcabinet.dm
code/modules/power/cable_heavyduty.dm
code/modules/projectiles/guns/energy/temperature.dm
code/setup.dm
config/game_options.txt
icons/mob/screen1_Midnight.dmi
icons/mob/screen1_Orange.dmi
icons/mob/screen1_alien.dmi
icons/mob/screen1_old.dmi
icons/obj/atmospherics/passive_gate.dmi
icons/obj/pipe-item.dmi
interface/interface.dm
2012-10-05 22:21:26 +10:00
giacomand@gmail.com
f6195ed777
-Hallucinations can be cured. Anti-Toxin and Synaptizine will cure it, while the latter being more effective at it.
...
-Forgot to commit a file.
-PDA codes aren't case sensitive anymore.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4811 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-05 05:23:28 +00:00
quartz235@gmail.com
a6e7c085ef
Revert's cib's BS12 merge by XSI's orders
...
- Tested with various damtypes/locations/mobs but if i'm a dumbass and overlooked a problem feel free to punch me and revert this
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4762 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-27 02:14:21 +00:00
Cael_Aislinn
b618eeef82
Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
...
Conflicts:
code/controllers/configuration.dm
code/game/atoms.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/gamemodes/factions.dm
code/game/objects/items/devices/uplinks.dm
code/game/verbs/ooc.dm
code/game/verbs/who.dm
code/modules/admin/admin.dm
code/modules/admin/admin_verbs.dm
code/modules/admin/player_panel.dm
code/modules/admin/verbs/adminpm.dm
code/modules/admin/verbs/getlogs.dm
code/modules/client/client defines.dm
code/modules/client/client procs.dm
code/modules/mob/living/login.dm
code/modules/mob/new_player/preferences_setup.dm
code/modules/paperwork/paper.dm
config/config.txt
html/changelog.html
icons/mob/human.dmi
icons/mob/human_face.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-09-26 18:49:18 +10:00
rockdtben@gmail.com
b4815552ba
cart.dm: Removed a useless line in my commit from r2436.
...
FEA_gas_mixture.dm: Removed comments that documented a removal of useless variables. I will let the SVN handle documenting that.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4752 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-25 10:08:49 +00:00
Cael_Aislinn
e645d78f11
Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/datums/organs/organ_internal.dm
code/datums/vote.dm
code/defines/atom.dm
code/defines/procs/gamehelpers.dm
code/defines/turf.dm
code/game/algorithm.dm
code/game/cellautomata.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/events.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/gamemodes/events/space_ninja.dm
code/game/gamemodes/wizard/rightandwrong.dm
code/game/jobs/job/captain.dm
code/game/machinery/computer/ai_core.dm
code/game/machinery/computer/law.dm
code/game/machinery/computer/pod.dm
code/game/machinery/computer/syndicate_shuttle.dm
code/game/machinery/doors/firedoor.dm
code/game/machinery/teleporter.dm
code/game/machinery/wishgranter.dm
code/game/objects/items/devices/uplinks.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/structures/electricchair.dm
code/game/turfs/turf.dm
code/game/vote.dm
code/hub.dm
code/modules/admin/admin_verbs.dm
code/modules/awaymissions/zlevel.dm
code/modules/client/client defines.dm
code/modules/food/food.dm
code/modules/food/meat.dm
code/modules/food/recipes_microwave.dm
code/modules/mob/living/carbon/carbon_defines.dm
code/modules/mob/living/carbon/human/hud.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/login.dm
code/modules/mob/living/simple_animal/life.dm
code/modules/mob/mob_defines.dm
code/modules/mob/new_player/login.dm
code/modules/paperwork/filingcabinet.dm
code/modules/paperwork/folders.dm
code/modules/paperwork/photocopier.dm
code/setup.dm
icons/effects/genetics.dmi
interface/interface.dm
interface/skin.dmf
maps/RandomZLevels/fileList.txt
various misc mergefixes and todos
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-09-22 21:29:04 +10:00
CIB123
d6dfd49a75
Ported parts of the BS12 organ system.
...
This includes:
- Individual wounds
- Dismemberment
- Bone breaking
It also adds configuration values to config/game_options.txt to control the point at which bones break and limbs are cut off.
Does not include surgery or bleeding yet.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4720 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-18 21:32:39 +00:00
petethegoat@gmail.com
2717517f17
Fixes issue 854. I have very little confidence in the longevity of my fix, so if any issues with the nuke shuttle doors arise in the future, please inform me!
...
Added a little bar for nuke ops to relax in, following a job well done.
Updated pod control computers to only show time controls if a mass driver is attached. Doors don't need to be on a timer.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4703 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-16 14:32:23 +00:00
petethegoat@gmail.com
99745c2295
Fixes issue 929.
...
Changed nuke ops to use buffed C20Rs again, hurray!
Cleaned up the nuke shuttle code in preparation for fixing issue 854, and renamed var/derp.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4701 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-16 12:42:58 +00:00
Cael_Aislinn
e6078b100f
Merge tgstation r4572 into bs12_with_tgport, fixed missing title screen (tgside problem?), some conflicts
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-08-28 20:22:22 +10:00
Cael_Aislinn
eacd84b212
Merge tgstation13 r4570 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/defines/obj.dm
code/defines/procs/helpers.dm
code/defines/turf.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/gamemodes/cult/cult_structures.dm
code/game/gamemodes/events.dm
code/game/machinery/telecomms/machine_interactions.dm
code/game/master_controller.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/devices/uplinks.dm
code/game/objects/items/item.dm
code/game/objects/items/weapons/gift_wrappaper.dm
code/game/objects/items/weapons/wires.dm
code/game/objects/weapons.dm
code/game/turfs/turf.dm
code/modules/clothing/head/hardhat.dm
code/modules/mining/mine_items.dm
code/modules/mining/mine_turfs.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/mob_defines.dm
code/modules/mob/new_player/login.dm
code/modules/paperwork/pen.dm
code/modules/paperwork/stamps.dm
code/unused/toilets.dm
html/changelog.html
icons/effects/alert.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-08-28 19:57:11 +10:00
giacomand@gmail.com
a84ccb93ff
-Fixed an issue where you couldn't send messages to people inside lockers.
...
-AI has to double click to move by turf.
-If more than a certain number of alarms are triggered, the AI and Cyborg will instead receive a message saying how many alarms have been triggered and of which type, they will then get a link to the "view alarms" proc. This also counts for cleared alarms.
-Fixed an issue with creating turfs and it not showing up on the camera.
-Modified the "Communication Blackout" event. It will now notify the AI that comms are down, if it is var/silent. Increased the EMP duration for telecomm machines.
-Updated the changelog.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4572 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-28 08:13:00 +00:00
johnsonmt88@gmail.com
d36387607f
More file structure stuff.
...
- The folders themselves are now finished
- Next I'll go through each file and organize them
- Lastly I'll start pulling the object definitions out of /code/defines/ and put them into their respective files.
**Note to committers**
Make sure the .dme file updates when you update to this revision. If necessary delete the .dme and svn-update.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4546 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-26 01:20:02 +00:00
