Commit Graph

361 Commits

Author SHA1 Message Date
cib
6ab420237b Attack log will now store type path for bullets. 2012-12-06 15:14:17 +01:00
giacomand@gmail.com
fc90b08e1c -Changed the limits of the server room alarm to fix Issue 1143.
-Changed the singularity code a bit. Checking for the last movement had some problems, I changed it around. It fixed Issue 1121.
-In addition of this, the singularity will now move diagonally. It doesn't get stuck in the corners of the field now.
-Mimics which are structures, have density and anchored will be able to knockdown people and be twice as strong.
-Doubled the amount of times the staff of animation can fire before needing to recharge, since it had to shoot way more than the staff of change to be effective.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5256 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-04 16:55:04 +00:00
Cael_Aislinn
39f07d50bf Merge https://github.com/Baystation12/Baystation12 into features 2012-12-03 18:54:21 +10:00
Cael_Aislinn
d09d7bf313 changed alien neurotoxin to bio type projectile (which means it's stopped by protective gear like biosuits), fixed a runtime
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-03 13:50:57 +10:00
giacomand@gmail.com
9941bb8587 Added mimics! There's the classic crate (chest) mimic which waits until somebody is close before trying to attack them. You can fill him with loot by putting items on him on your map. This was done by changing the base initialize proc to an /atom/movable and then instead of looping through the world for objects, instead loop for atom movables.
The next type of mimic is for the staff of animation! They will copy the icon of the object they're copying and will set themselves stats based on the object too. They will not attack the bearer of the staff which made them animated.

Added the option to get the staff on the wizard's spell book.

Added a "friends" var to hostile mobs. It will make the simple animal ignore friends when choosing targets.

Changed the statues from /obj/effect/showcase to /obj/structure/showcase.

Added a new variable to projectiles, "shot_from" is the gun that shot the projectile. It's used to determine what staff animated the mob and it will then add that staff, so it can ignore it when choosing targets.

Added a wander var for simple animals, turning it to 0 will stop the simple animal from moving when idle.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5246 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-02 04:38:43 +00: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
Kortgstation@gmail.com
09e9762e40 Added a check for the items w_class when you try equipping it to a suit storage slot. This means the ion rifle, SAW, and staff of change will no longer fit on armour.
Added a new gun/projectile which deals brainloss as well as causes hallucinations.

Replaced the pulse rifle in stationCollision with the new gun.

Gave the HoS gateway access so he can banish people.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5201 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-26 12:50:25 +00:00
petethegoat@gmail.com
dbd759477e Improved window code, mostly formatting and styles, but also general improvements.
I've tested it a fair bit, but there may be bugs, so please report those if you run into them.

Added an ismetroidadult() helper

Improved L6 code.
Made the syndie shuttle console impervious to bullets.
Made mirrors breakable.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5187 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 17:09:38 +00:00
petethegoat@gmail.com
fd9f6490f1 Updated listeningpost.dmm to look nicer and be a bit more interesting.
Updated the Stechtkov pistol. Should be pretty solid now.
Made a returning ex_act for snow floors.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5182 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-24 17:38:24 +00:00
Kortgstation@gmail.com
afe9e93c05 Fixed name of the medical rig
Fixed the exile implant locker.

Made syndicate simple animals slightly squishier (block chance lowered).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5160 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-22 08:15:07 +00:00
Whitellama
f3e3ce7429 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-21 04:01:32 -08:00
Whitellama
900b931c34 Readded Xenobiology shuttle, readded combat shotguns to armoury (with beanbag shells), Removed Roboticist's access from command-clearance tech storage 2012-11-21 04:00:31 -08:00
petethegoat@gmail.com
92d41a543f Removed unused and unneeded sprites from gun.dmi
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5139 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-20 19:47:44 +00:00
petethegoat@gmail.com
c6b8a3b009 Fixed some L6 issues.
Added a pistol that can be silenced for future nuke op use.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5138 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-20 18:57:14 +00:00
Travis Whitehead
5ad12e5c95 WIP: Porting gun targeting 2012-11-19 12:32:36 -08:00
Whitellama
77b6f1e6fc WIP: Porting gun auto-targetting + suicide 2012-11-18 17:40:39 -08:00
Chinsky
684679cefb Fixes issue #1971
Lasertag and practice beams won't explode tanks anymore.
2012-11-18 11:24:17 +04:00
petethegoat@gmail.com
ee66c32bd0 Updated the L6.
Fixes issue 1095. L6 Icons bugged after reload

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5089 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-16 18:52:41 +00:00
Ater Ignis
8c5b8f8d50 final pass of merging with my branch
I hope I have not forgot anything
Still, it compiled for me at least, and passes test cases i did
2012-11-16 18:54:43 +04:00
Chinsky
8e60315b11 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2012-11-13 04:02:26 +04:00
Chinsky
058aa7a795 Fix for training gun runtime. 2012-11-13 01:42:11 +04:00
Mloc
d659b567a4 Fix for practice lasers.
Addresses #1924
2012-11-12 20:21:30 +00:00
Kortgstation@gmail.com
a38b22fb70 Fixed the invisible ammo for the SAW.
Made the SAW not fit in bags.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5038 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-11 09:06:36 +00:00
Kortgstation@gmail.com
ab4c92e066 Using summon guns gives a message to the the user to confirm it working.
Added a new borg upgrade module which requires illegal tech and combat tech to make. It allows you to give them their emagged equipment without fucking with their laws.

New LMG by Ausops (both sprites and code). Right now appears only in Summon Guns, but may appear elsewhere in time.

Grilles now have a bullet act, so they no longer magically absorb infinite bullets.

Updated changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5037 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-11 07:43:49 +00:00
Chinsky
1a02f2ff1c Proted instabeams for energy projectiles.
Also buffed laser damage to pre-merge.
2012-11-06 20:35:48 +04:00
Chinsky
683e4f304a Fix for detective revolver.
Turns out my previous fix did not help. Problem was in detective ammo having wrong caliber.
2012-10-30 03:07:51 +04:00
sieve32@gmail.com
1879167cd4 - Made Mimewalls a seperate instance of forcefields instead of the special-snowflake-mime-dependent ones. When made, they are added to processing_objects, and count down every process() until they delete themselves(And are removed from processing_objects)
Fixes Issue 1025
- Made the Nuke Disk delete itself under certain conditions when it hits a transition tile in space, specifically if it is inside a bag and NOT on a living mob's back with a client, so spaced containers, backpack on braindead body, backpack on corpse will no longer make Nuclear Emergency unwinnable.
Fixes Issue 1026
- Added parse_zone() to projectile/Bump(), so instead of being hit in the "r_leg" you would be hit in the "right leg", and so on.
Fixes Issue 1028
- Touched up my throw logging so that instead of doing a search through the player_list to match stuff up, it simply pulls the client from carn's directory list

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4976 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-28 18:40:52 +00: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
9716049b4e Fixed derp. 2012-10-25 17:53:59 +04:00
Chinsky
eb72f2d48e Fixed couple of holster messages typos.
Reworked way isHolster() works.
Fixed bug with detecive revolver, making it impossible to reload.
2012-10-25 16:32:57 +04:00
Chinsky
236780d8c6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-25 03:42:20 +04:00
Chinsky
9d34691b82 Added holsters and bunny slippers.
Holsters work a bit different from before.
They utilize system for clipping things on uniform.
So now holster can be worn on any clothing.
Also it can now hold any handgun(or what I assumed to be handgun).
2012-10-25 02:00:48 +04:00
giacomand@gmail.com
dd8d1f6ac2 -You can now target non-dense objects with a projectile.
-Added bullet_acts for computers, canisters and windoors.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4953 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 21:56:00 +00:00
Cael_Aislinn
2f853fe23a Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/devices/radio/radio.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/say.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/paperwork/paperbin.dm
	html/changelog.html
	icons/turf/areas.dmi
	maps/RandomZLevels/assistantChamber.dmm
	maps/RandomZLevels/fileList.txt

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 00:25:05 +10:00
aranclanos@hotmail.com
d25a5d5aa3 Fixes issue 1001.
Fixes issue 994. (Chemsprayers are not included)
Fixes issue 990.
Adding some instant admin logs and server logs for some stuff in emitters/PA. See image. http://i.imgur.com/7kQpH.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4904 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-17 14:27:23 +00: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
Kortgstation@gmail.com
18608f3ca6 Added Syndicate NPCs/sprites for them. They come in a few varieties, some with shields and swords, some with guns(yes they shoot). They're simple animals, but they drop a corpse landmark when they die, so you can loot them normally.
A plea to admins: Dont fucking spawn these everywhere, they're meant to be used as badguys in away missions, not for you to fuck up every round by spawning 70 of them.

Clowns also drop a real (lootable) body on death.

Added new corpse types. Syndicates as well as several civillian jobs.

Added a new area/copied a shuttle icon over into floors as part of work on my map.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4839 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-09 19:22:14 +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
sieve32@gmail.com
8c387f2158 -Made all contructs children of /mob/living/simple_animal/construct and changed the type paths as needed
-Now when examining someone you can tell if their brain is missing, and it doesn't give the 'catatonic' part (Because the player is in a different mob and it's kind of misleading)
-Committed Lugar223's patch for the temperature gun, preventing the window from re-opening as it heats up/cools down
Fixes Issue 900
-Fixed the issue where dead players could use pAI carts if they left the window open
Fixes Issue 967
-Changed how the Destructive Analyzer handles sheets, now it will only deconstruct 1 sheet out of the stack at a time. Also found a bug where it would destroy its own components, so that is fixed as well.
Fixes Issue 989
-Secborgs can no longer put their stun baton or energy gun in rechargers, added a check for /mob/living/silicon
Fixes Issue 972

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4807 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-04 22:08:27 +00:00
Erthilo
c00b0ae84d Added attack logging, some moderator groundwork, fixed alien species and save files. 2012-09-23 21:49:25 +01: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
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
Kortgstation@gmail.com
3e96bdc5e8 Hulks can't use guns. Hopefully this encourages them to actually go around punching things instead of having their magic stun immunity shield while playing normally.
Alien queen regen is now 5 instead of 15. Will this fix aliens? No. But it will make it so they're not immortal in the mean time.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4676 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-11 03:43:30 +00:00
Cael_Aislinn
f7fcfa2a6f Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4649)
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/machinery/computer/law.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html
	icons/effects/effects.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-08 14:22:44 +10:00
giacomand@gmail.com
ecd2bcec56 -Holograms are range based again.
-Instead of the singularity using range to look for rad_collectors around it, it will now look through the list and check the distance between every rad_collector, if it's less than 15 tiles in range then it'll give it power.
-Fixed naming your revolver.
-

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4638 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-06 21:24:33 +00:00
Cael_Aislinn
c4bd191222 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/defines/obj.dm
	code/game/gamemodes/events.dm
	code/game/machinery/newscaster.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/game/turfs/turf.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/maps/fromdmp.dm
	code/modules/mob/living/silicon/ai/freelook/eye.dm
	code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_movement.dm
	code/setup.dm
	icons/mob/uniform.dmi
	icons/obj/closet.dmi
	icons/obj/clothing/uniforms.dmi
	maps/RandomZLevels/assistantChamber.dmm
	maps/RandomZLevels/fileList.txt
	maps/tgstation.2.0.9.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-04 22:19:03 +10:00
Kortgstation@gmail.com
abb7be68ea Gyropistol now uses magazines.
New Gyropistol and Gyropistol magazine sprites by Ausops.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4602 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-02 19:44:06 +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
d_h2005@yahoo.com
a3ca5e7ded The yield mode on the somatoray gun now uses a diminishing-returns formula to determine the chance of increasing yield (instead of a hard cap at 2)! Cleaned up somatoray code a bit too.
Doctor's Delight, the miracle drug, now requires tricordrazine to brew.
Fixes Issue 858. The text is now gender sensitive.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4571 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-28 03:17:13 +00:00