ZomgPonies
5daf979b72
Pretty much all new click code
2013-10-12 14:44:36 -04:00
ZomgPonies
e3556791a7
Fancy Alt-Clicking for blob and others
2013-09-24 20:12:12 -04:00
ZomgPonies
c1222034ee
BS12 -> Ponies merge
2013-09-09 10:51:16 -04:00
ZomgPonies
a935863200
Made blob gamemode work, removed ninjas because needs overhaul, optimized some strings
2013-09-08 11:39:33 -04:00
Mloc-Argent
71bdaa1698
Fully reverts clickdelay change.
...
It was immensely buggy with certain mobs, and server lag all but negated the benefits.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-13 13:10:09 +01:00
Zuhayr
f50256eabb
Work progresses on species datums. Mass-commit due to repo issues requiring a reset.
2013-07-31 11:50:56 -07:00
Mloc-Argent
9d2e107005
Reactiveness update part 1: Removed click delays from most objects, keeping them on for attacks and breaking windows/grilles.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-25 18:30:24 +01:00
Jamini
920b855f6c
Added employment records.
...
Added employment records console.
Added circuit for employment records.
Added employment records consoles to every head of staff office. (Map)
Added a circuit spawn for an employment console in tech storage (Map)
Fixed pod 5.
Signed-off-by: Jamini <mobiousjami@gmail.com >
2013-07-24 22:23:50 -04:00
Mloc-Argent
cf53dd7a10
Revert "Adds in the Kida"
...
This reverts commit a2fddc0fc1 .
2013-07-12 12:22:35 +01:00
Zuhayr
23299809f6
Armalis sprites, simple animal/mob yank-out verb and embedding.
2013-06-16 00:38:40 -07:00
Zuhayr
b1cac56e9a
Merge resolution.
2013-06-15 03:54:22 -07:00
Zuhayr
6b73b8ec2f
Adjusted kitchen knives. Added projectile pinning. Various tweaks.
2013-06-13 20:46:09 -07:00
NicholasDV
a2fddc0fc1
Adds in the Kida
...
Adds in the Kida Race to all parts.
2013-06-13 18:22:05 -04:00
Zuhayr
06f04e6374
Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite.
2013-06-05 17:35:38 +09:30
Chinsky
55671d7485
Merge branch 'guntest' of https://github.com/Whitellama/Baystation12 into gunmode
...
Conflicts:
code/modules/mob/living/simple_animal/simple_animal.dm
icons/mob/screen1_old.dmi
2013-03-06 17:04:45 +04:00
RavingManiac
839d4cb6c8
Added var/small to mobs, which currently only handles if they can open airlocks. This replaces the use of ismouse().
2013-02-19 22:10:27 +08:00
Whitellama
5d090b0611
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into guntest
...
Conflicts:
code/WorkInProgress/Cib/amorph/amorph_hud.dm
code/game/objects/structures/window.dm
code/modules/mob/living/blob/blob.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
code/modules/mob/mob_defines.dm
code/modules/mob/screen.dm
code/modules/projectiles/gun.dm
code/modules/projectiles/guns/projectile/automatic.dm
maps/tgstation.2.0.9.1.dmm
2013-01-31 14:26:58 -08:00
Cael_Aislinn
bb5a349fcf
Merge branch 'incremental_tg' r5600 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/__HELPERS/global_lists.dm
code/controllers/master_controller.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/gamemodes/events/space_ninja.dm
code/game/gamemodes/wizard/rightandwrong.dm
code/game/hud.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/job.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/science.dm
code/game/jobs/job/security.dm
code/game/machinery/computer/cloning.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/weapons/gift_wrappaper.dm
code/game/objects/items/weapons/implants/implantnanoaug.dm
code/game/objects/items/weapons/storage/uplink_kits.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/turfs/turf.dm
code/modules/client/client defines.dm
code/modules/client/client procs.dm
code/modules/clothing/masks/miscellaneous.dm
code/modules/clothing/shoes/miscellaneous.dm
code/modules/clothing/under/ties.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/silicon/say.dm
code/modules/mob/mob_defines.dm
code/modules/paperwork/clipboard.dm
code/modules/paperwork/pen.dm
code/modules/paperwork/stamps.dm
code/modules/projectiles/projectile.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/reagent_containers/glass.dm
code/setup.dm
config/config.txt
html/changelog.html
icons/effects/effects.dmi
icons/mob/feet.dmi
icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/mask.dmi
icons/mob/suit.dmi
icons/mob/ties.dmi
icons/mob/uniform.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/masks.dmi
icons/obj/clothing/shoes.dmi
icons/obj/clothing/suits.dmi
icons/obj/clothing/ties.dmi
maps/tgstation.2.1.0.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-23 00:23:37 +10:00
Kortgstation@gmail.com
b0077b3498
Removed nanoaugs, they were unbalanced and never used outside of badmins shitting things up.
...
They also added extra checks to
-Everytime a mob attacked (checking for super strength and electric hands)
-Every time a mob was attacked (checking for dermal armour)
-Every time a human was shot (checking for reflex)
-Every time a human breathed (checking for rebreather)
-Every tick of human life (checking for regen)
-Every hud update (checking for radar)
Not to mention just cluttered mob code in general. I know there won't be any noticeable performance increase from this but seeing as they were never going to be finished (I asked Doohl beforehand) and mob code is messy enough as is, I think only good can come of removing the code.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5587 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-20 10:45:20 +00:00
Cael_Aislinn
bdeb96b7e5
Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/ATMOSPHERICS/components/unary/vent_pump.dm
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
code/__HELPERS/game.dm
code/controllers/shuttle_controller.dm
code/datums/datumvars.dm
code/datums/supplypacks.dm
code/defines/obj/storage.dm
code/defines/obj/vending.dm
code/defines/obj/weapon.dm
code/defines/procs/command_alert.dm
code/game/area/Space Station 13 areas.dm
code/game/atoms.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/events.dm
code/game/gamemodes/events/dust.dm
code/game/gamemodes/events/miniblob.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/gamemodes/factions.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/gameticker.dm
code/game/jobs/access.dm
code/game/jobs/job/assistant.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/engineering.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/science.dm
code/game/jobs/job/security.dm
code/game/jobs/job_controller.dm
code/game/machinery/alarm.dm
code/game/machinery/atmo_control.dm
code/game/machinery/atmoalter/area_atmos_computer.dm
code/game/machinery/bots/medbot.dm
code/game/machinery/computer/HolodeckControl.dm
code/game/machinery/computer/ai_core.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/message.dm
code/game/machinery/computer/pod.dm
code/game/machinery/computer/prisoner.dm
code/game/machinery/computer/syndicate_shuttle.dm
code/game/machinery/constructable_frame.dm
code/game/machinery/doors/door.dm
code/game/machinery/doors/firedoor.dm
code/game/machinery/newscaster.dm
code/game/machinery/recharger.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/teleporter.dm
code/game/machinery/wishgranter.dm
code/game/mecha/mech_fabricator.dm
code/game/mecha/working/ripley.dm
code/game/objects/items.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/devices/flashlight.dm
code/game/objects/items/devices/radio/encryptionkey.dm
code/game/objects/items/devices/uplinks.dm
code/game/objects/items/stacks/medical.dm
code/game/objects/items/weapons/cards_ids.dm
code/game/objects/items/weapons/gift_wrappaper.dm
code/game/objects/items/weapons/hydroponics.dm
code/game/objects/items/weapons/manuals.dm
code/game/objects/items/weapons/secstorage/secstorage.dm
code/game/objects/items/weapons/storage/backpack.dm
code/game/objects/items/weapons/storage/firstaid.dm
code/game/objects/items/weapons/storage/kit.dm
code/game/objects/items/weapons/storage/storage.dm
code/game/objects/items/weapons/storage/toolbox.dm
code/game/objects/items/weapons/storage/uplink_kits.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/objects/items/weapons/tools.dm
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
code/game/objects/structures/crates_lockers/closets/secure/security.dm
code/game/objects/structures/electricchair.dm
code/game/objects/structures/extinguisher.dm
code/game/objects/structures/watercloset.dm
code/game/objects/weapons.dm
code/game/turfs/turf.dm
code/game/vehicles/airtight/airtight.dm
code/game/vehicles/vehicle.dm
code/global.dm
code/modules/DetectiveWork/evidence.dm
code/modules/admin/IsBanned.dm
code/modules/admin/player_panel.dm
code/modules/admin/verbs/diagnostics.dm
code/modules/admin/verbs/getlogs.dm
code/modules/client/preferences.dm
code/modules/clothing/masks/miscellaneous.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/clothing/suits/miscellaneous.dm
code/modules/critters/critter_defenses.dm
code/modules/detectivework/scanner.dm
code/modules/flufftext/Hallucination.dm
code/modules/food/recipes_microwave.dm
code/modules/mining/mine_items.dm
code/modules/mining/mine_turfs.dm
code/modules/mining/satchel_ore_boxdm.dm
code/modules/mob/dead/observer/observer.dm
code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
code/modules/mob/living/carbon/alien/special/facehugger.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/carbon_defines.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/carbon/metroid/metroid.dm
code/modules/mob/living/living.dm
code/modules/mob/living/silicon/ai/life.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/mob_defines.dm
code/modules/mob/mob_transformation_simple.dm
code/modules/paperwork/clipboard.dm
code/modules/paperwork/folders.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/paperbin.dm
code/modules/paperwork/pen.dm
code/modules/power/cable.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/projectile/revolver.dm
code/modules/projectiles/projectile/change.dm
code/modules/projectiles/projectile/special.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/glass.dm
code/modules/reagents/reagent_containers/hypospray.dm
code/modules/recycling/sortingmachinery.dm
code/modules/research/designs.dm
config/config.txt
html/changelog.html
icons/mob/head.dmi
icons/mob/hud.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/mask.dmi
icons/mob/suit.dmi
icons/mob/ties.dmi
icons/mob/uniform.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/masks.dmi
icons/obj/clothing/suits.dmi
icons/obj/clothing/ties.dmi
icons/obj/grenade.dmi
icons/obj/projectiles.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-11 22:12:31 +10:00
Cael_Aislinn
990090326d
compile fixes and cleanup
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-07 02:36:52 +10:00
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
Kortgstation@gmail.com
0c4f441cb5
Added Cheridan's slime sprites to replace roros. Replaced all mentions of roro/metroid with slime. Once Cheri has the rest of the sprites/Phol gets mutant race sprites I'll start work on redoing metroid/slime code with Giacom and adding breeding.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5223 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-29 04:12:22 +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
Kortgstation@gmail.com
338b934160
Added a "faction" var to mobs. This var gets checked when hostile simple animals attack something. Default is "neutral."
...
Changed the hostile code to allow for ranged mobs. Will port syndies over to hostile at some point (I don't want to go and replace the syndies on all the away maps right now).
Added pirate simple animals for Inti (icons are from him). Icons for russians and an on mob bear belt are in as well. There is a ranged version and a melee version.
Set factions for constructs, shades, carp, bears, faithless.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5176 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-24 13:19:08 +00:00
RavingManiac
e252c47a51
removes the floating code
2012-11-23 02:02:45 +08:00
elly1989@rocketmail.com
76ede03966
Moved mob/var/footsteps to /obj/item/clothing/shoes/clown_shoes/var/footsteps
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5166 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-22 17:43:25 +00:00
elly1989@rocketmail.com
73b54b017b
Removed mob/var/UI, it now uses client.prefs.UI_style
...
Removed var/constant/Pi It's already defined in setup.dm
Moved a bunch of global_lists to global_lists.dm
Fixed hair randomisation. (still bits to do)
Moved a lot of preferences_setup.dm stuff into __HELPERS/mobs.dm They'll be FAR more helpful as generic procs, rather than something tied to preferences.
Merged mob/var/nopush into status_flags with the CANPUSH flag
Merged mob/var/nodamage into status_flags with the GODMODE flag
Removed mob/var/be_syndicate and mob/var/be_random_name as they are not used.
Added /proc/ui_style2icon(ui_style) proc. It converts a string like "Midnight" into its corresponding dmi file. The code fore creating a new hud uses it.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5164 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-22 15:22:08 +00:00
giacomand@gmail.com
5b8b1b3302
-Added some visual hit indication by having a variable be set to 20 when the mob takes brute or fire damage. It will then be added to the health calculation, in the overlay code, and then it will reset to 0. Thus making a cool effect.
...
-Removed the waiting for light replacers.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5132 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-20 12:23:51 +00:00
Whitellama
f0be63eaa1
Allowed more mobs to emote with me verb
2012-11-20 03:09:42 -08:00
elly1989@rocketmail.com
30357d18ce
SANITY: Created a series of generalised sanity procs. They can be found in code/__HELPERS/sanitize_values.dm
...
They include such procs as sanitize_integer(num, min, max, default) which will check num is a number, round num to make it an integer, then check if it is between min and max (inclusive). If it fails the bound-checks it will return default. There are others, have a look.
PERSISTENT PREFERENCES: Every ckey which connects to the game gets its own persistent /datum/preferences datum.
It is archived in var/list/preferences_datums = list("ckey" = datum)
At connect it is automatically associated with the client defines.dm (or a new one is created if it can't find an archived prefs datum). This means clients will ALWAYS have a var/datum/preferences/prefs which references this datum. So you can use it without checking if(client.prefs)
This has simplified only a few bits of code. It will however, allow us to make preferences like see_deadchat ghost_ears etc, persistent. So they will not reset when you DC.
SAVEFILES: Changed the player savefile code a lot. Hopefully I've not fucked it up too much. Every single variable loaded from saves is now sanity checked using the new sanity procs. This should help prevent savefiles becomming obsolete by sanitizing input to meet current requirements, without deleting all the ok variables and making you start from scratch >_> NOTE: I still need to sort out the savefile version stuff. I'll probably figure it out before the server updates anyway. It sees to be fine without it.
You can no longer choose your blood type. It is randomised (with each bloodtype having a realistic probability of occuring). This is to make blood analysis (detective/medical) less pointless. It is chosen as soon as you connect. It remains persistent throughout each round so you won't be able to change it by logging in/out over and over.
Replaces some copypasta code with is_afk() (still a fair bit to do)
There are new hyperlink shortcut things. _src_=vars will direct your hyperlink to viewvars. _src_=prefs to your preferences datum. (These are the only way to access those bits of code via links). This means that the overall amount of operations in almost every Topic has pretty much halved and is much prettier.
Replaced and removed adminplayervars from datum/admins/Topic. It was superfluous. They now all point directly to the viewvars code using _src_=vars
Removed the changelog popup at round start. Instead a button on your game-window will glow white if there are new updates. To peruse at your convenience. This will speed up connect times.
Removed the AFK_THRESHOLD define. It is integrated into is_afk() now.
TODO: remove the prefs stuff from mobs and clients and update code to use client.prefs to access that info.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5121 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-19 15:13:57 +00:00
Whitellama
77b6f1e6fc
WIP: Porting gun auto-targetting + suicide
2012-11-18 17:40:39 -08:00
RavingManiac
7c76e0758d
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-11-18 22:04:20 +08:00
Mloc
9ca5caa419
Fixed the fix of the movement fix thing. Or something.
...
Signed-off-by: Mloc <colmohici@gmail.com >
2012-11-14 21:39:49 +00:00
Mloc
daac550822
Revert movement speed changer glide thing I DONT KNOW THE NAME AAAH.
...
Signed-off-by: Mloc <colmohici@gmail.com >
2012-11-12 21:54:16 +00:00
Kreastr
9ddc1d02d9
Merge branch 'master' of git://github.com/Baystation12/Baystation12
...
Conflicts:
code/modules/mob/mob_defines.dm
2012-11-11 16:43:28 +02:00
Ater Ignis
af0593e07b
Chemistry on child reagents and in mobs
...
Ethanol childs (most drinks in general) are treated as ethanol in reactions
Reactions are going inside mobs, but not make bubbling effect
2012-11-09 20:53:20 +04:00
Kreastr
001ea33ce0
Merge branch 'animation'
...
Merging animation fixes
Conflicts:
baystation12.dme
code/defines/obj.dm
code/modules/mob/mob_defines.dm
code/modules/mob/mob_movement.dm
config/admins.txt
2012-11-07 01:38:28 +02:00
Kreastr
2deb70a1a9
Some changes. Untested.
2012-11-07 00:08:02 +02:00
Cael_Aislinn
739e965b5f
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport, removed unnecessary includes fron the .dme
...
Conflicts:
baystation12.dme
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-11-03 12:21:54 +10:00
Chinsky
a2e83e962d
Alternative titles system.
...
Custom character records.
Different clothing for alternative titles.
2012-10-31 08:40:51 +04:00
Cael_Aislinn
698425a987
readd ssd sleep
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-30 23:46:54 +10:00
Ater Ignis
fa1d74e435
added comments
2012-10-29 15:04:30 +04:00
Ater Ignis
55c553f535
1) show dismemberments on player: erase limbs which are ORGAN_DESTROYED
...
2) if player is husk - still try to overlay robotic limbs if they are present, but not anything else
3) human without legs can't stay, right? but he can crawl if there exist any part of arm or leg - only fully delimbed body can't move
2012-10-25 20:00:44 +04:00
DarkTechnomancer
4bf6833a62
Fixed flavor text
2012-10-13 19:27:43 -04:00
cib
fb60301594
Revert "Revert's cib's BS12 merge by XSI's orders"
...
This reverts commit a6e7c085ef .
Conflicts:
baystation12.dme
code/datums/organs/organ_external.dm
code/game/gamemodes/events/ninja_equipment.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/carbon/human/hud.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_defines.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/mob_defines.dm
code/setup.dm
icons/mob/dam_human.dmi
icons/mob/human.dmi
2012-10-11 14:31:31 -07:00
Cael_Aislinn
825a7dcbf9
various mergefixes
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-09 22:49:38 +10: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
RavingManiac
e558f1f0f1
Makes the sprite of a mob bob up and down while it is in space, unless it is wearing magboots.
2012-10-03 23:03:17 +08:00
elly1989@rocketmail.com
14c5bcf325
Removed a lot of commented out code from hud. Removed some unused variables.
...
Trying to move everything into datum/hud, doing this will allow huds to be made more modular. Meaning more mobs can have huds with smaller and maintainable code.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4773 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-29 08:48:19 +00:00