Commit Graph

4401 Commits

Author SHA1 Message Date
Chinsky
7b1732dda0 Moved global steps list and it's initializing to TG's new place for such things.
Moved helper for checking if mob is down on some operable surface to unsorted helpers.
Checking for tool type now will properly work with subtypes (istype instead of comparing type var)/
2013-01-02 18:38:31 +04:00
giacomand@gmail.com
f2854db4b0 -Made firesuits effective again by changing the proc which damages the humans due to the flames to fire_act(). The flames themselves will hurt people, who are directly on top of it, but if they're wearing a firesuit the damage is much less.
-Added some procs for getting IDs and getting access. Helps clean it up so we don't have "istype(A, IDCARD) OR istype(A, PDA)" everywhere.

-Made wallets equip able in the ID slot and be able to be used as an ID.

-Added a PACMAN generator in Engineering to jump start the Singularity if they run out of power.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5450 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-02 11:26:30 +00:00
GauHelldragon
b1dd8f50f3 Seedbags!
Added seedbags to hydroponic lockers and the nutri-vendor
They function similarly to plantbags, but obviously hold seeds. The interface for taking seeds out is identical to the smartfridge, however.
2013-01-02 02:54:48 -08:00
ericgfwong@hotmail.com
468a106278 Science lockers spawn with their striped labcoat now.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5445 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-02 01:22:52 +00:00
giacomand@gmail.com
c276432b84 -pAIs can no longer use an exploit to bring up the PDA window menu.
-Made "Do not ask me this round" last only for that round. At the moment the action is undoable so I added a warning. Fixes Issue 1209 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5442 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-01 02:27:37 +00:00
johnsonmt88@gmail.com
e7ebfae317 Another whack at the defines folder:
Removed defines/obj/toy.dm and moved the defines down to objects/items/toys.dm

Moved a big chunk of defines out of defines/obj/weapon.dm and into their respective .dm files.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5441 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-01 01:25:02 +00:00
aranclanos@hotmail.com
71694d809c Runtime fix for finishing the appendicitis surgery, using the cautery. The disease was being deleted before it was added to the resistance list. However, this is already done on the datum/disease proc, cure()
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5437 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-31 11:13:13 +00:00
aranclanos@hotmail.com
eee9bbf94a Runtime fix for trying to use an empty hand on a secure briefcase.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5436 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-31 10:25:55 +00:00
aranclanos@hotmail.com
5f90ea1a0f Runtime fix for moving around your hands a light tile. The new() proc of the light tiles missed some vars that the parent proc uses.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5434 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-31 08:42:11 +00:00
aranclanos@hotmail.com
ed0f8bf066 Fixes a runtime if there's no mob when a dna injector is injected by adding a sanity check.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5432 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-31 05:37:51 +00:00
ericgfwong@hotmail.com
70dcb95ddd Reorganized the Command Sector. The Captain has his own private quarters in addition to his office.
https://dl.dropbox.com/u/831776/bridge_swap11.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5426 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-30 23:41:45 +00:00
johnsonmt88@gmail.com
154a7c0f76 The code compiles again but I make no promises about whether or not the piano works.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5425 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-30 17:51:49 +00:00
giacomand@gmail.com
a04eb3f275 -Changed emitters.
Emitters will now need to be wired.
Emitter type has changed to /obj/machinery/power/emitter
Fixed cables not correctly disconnecting power machinery from the powernet after being removed.

-Fixed a typo with smashing tables/racks.
-Fixed maps having incorrect types.
-Fixed singularity EMPing when at stage 1.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5423 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-30 10:47:25 +00:00
daniel.cf.hultgren@gmail.com
49d87eed07 Reverted to oldpiano until me or somebody else decides to fix baysongs and whatever bugs there are.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5422 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-30 10:03:38 +00: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
ericgfwong@hotmail.com
ed01727e8b Whoops, did not mean to give the Captain that.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5408 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-27 06:48:48 +00:00
ericgfwong@hotmail.com
db6d43146e Analysing gas tanks is no longer a built-in function of PDAs
Added Gas Scanner function to atmos and science carts
Added spare atmos PDA cart to CE office
Fixed engineering break room tile icons

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5407 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-27 06:38:16 +00:00
johnsonmt88@gmail.com
d4dc5ae070 Moved var/force from /obj/item to /obj so that everything gets it, including structures and machines that get tossed around using Telekenesis. The default force is still 0. This should finally put a stop to a large number of runtimes.
Runtime fix for being hit by something without there being a usr. This was most likely due to explosions or possibly mass drivers.

Runtime fix for simple animals using department channels. Only parrots can use them now as they are the only simple animal with the 'ears' variable.

Runtime fix for the mech's energy relay process() when there is no battery in the mech.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5405 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-27 02:08:41 +00:00
Cael_Aislinn
f4c1cb325a some tweaks to artifacts, new xenoarch analysis machines, made empulse give a cool whoosh to everyone in range
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-27 01:35:13 +10:00
ericgfwong@hotmail.com
e3713d8604 Raised minimum timer for C4 to 10 seconds.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5401 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-26 01:21:39 +00:00
cib
39b12b280a Fixed a few problems with PDA crew manifest. 2012-12-24 21:13:29 +01:00
giacomand@gmail.com
3e24586d6b -Work done on facehuggers to stop them from being buggy if they're sterile or in a bag. Added icon sprites for inactive facehuggers when they're on a person, meaning they won't turn invisible.
Fixes Issue 1052
Fixes Issue 1065

-Added a world limit for blueprints naming areas.
-Fixed a wrongfully named research design.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5394 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-24 19:56:20 +00: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
cib
026bbfa3b7 Implemented ghetto surgery tools. 2012-12-24 18:25:02 +01:00
giacomand@gmail.com
e9fd2037d2 -Committed lpeters's patch which Fixes Issue 1189. http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=11549
-Made the shower not require power.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5391 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-24 01:38:36 +00:00
giacomand@gmail.com
fc86180f6c -The Military PDA will not show up on possible PDAs to message but you can reply to the PDA if it sends a message to you.
-Changed the exchange rate for plasma to supply points to 2:1
-Admins can now see photos in newscaster channels when using the button in the fun tab.
-Updated changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5383 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-23 20:08:32 +00:00
Hawk-v3
aa9207ba44 Merge pull request #2102 from Ravensdale/master
Station-wide boom sound
2012-12-23 06:00:41 -08:00
Ravensdale
6a359474cc Update code/game/objects/explosion.dm
Removing a repeat if statement
2012-12-22 14:58:01 -08:00
Ravensdale
9d9061180d Port of z-level explosion sound effect from pre-merge. Tested and confirmed working with c-4, welding tanks, meteors and roro explosions, probably more! 2012-12-22 14:46:44 -08:00
Hawk-v3
70b40dfc6b Merge pull request #2096 from comma/crates
Crates
2012-12-22 08:29:21 -08:00
d_h2005@yahoo.com
12e8a32eb2 Tiny adjustment for Ikarrus: The alternate HoS jumpsuit is not a subtype of the normal, and therefore counts towards fulfillment of the Steal objective.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5365 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-21 04:28:11 +00:00
Chinsky
581f2c4db5 Merge branch 'master' into crates 2012-12-21 01:03:20 +04:00
cib
1d0147c396 Merge branch 'master' of github.com:Baystation12/Baystation12 into feature 2012-12-19 19:40:28 +01:00
d_h2005@yahoo.com
68969baa5c Fixes issue 1106 - Splits the chicken suit into suit and hat. Adds an egg to the costume landmark for honks and giggles.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5359 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-19 06:36:12 +00:00
Zuhayr
24473bdd19 A small fix to the throwing string when a mob is struck with a baton. 2012-12-19 01:57:47 -08:00
giacomand@gmail.com
eca72b69aa -Added constructable solar arrays.
-Added a solar pack crate to order.
-Machines that have a use_power of 0 will no longer be turned off due to lack of power in the area.
-Fixed a bug with the solar computer not reconnecting to the powernet when dismantled and remantled.
-Increased the cap of crates to 30.
-Some performance tweaks.
-Some standardization.
-All objects of type /obj/machinery/power will try to disconnect from the powernet before deleting, this will help reduce the node list size.
-Added a heat_proof variable for doors. It will effect glass airlocks and it'll determine whether they can block heat or not. Research glass airlocks will always have it enabled.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5344 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-16 19:51:23 +00:00
ericgfwong@hotmail.com
41e3f7bf64 -Added fire extinguishers to xeno and viro
-Added lights to singularity containment
-Engineering lockers now use Power Equipment access
-Expanded Tox Storage access to include the Tox lab, making it a separate access like Xenobiology

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5343 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-16 19:10:45 +00:00
cib
679c715482 Merge branch 'master' of github.com:Baystation12/Baystation12 into minor_feature 2012-12-16 14:57:54 +01:00
cib
a6d5a6a26e Removed yet another type of gib that looks like a head.
Just how many heads does a person have, according to this code?
2012-12-16 04:40:19 +01:00
cib
0855c5d1af Fixes issue #2006
Medical belt can now hold autoinjector.
2012-12-16 04:04:43 +01:00
cib
9c4a48ffe5 Gibbing now creates actual limbs instead of decals.
Especially useful for the head, but also pretty nice in that you can now pick the limbs up and mail them to security.
2012-12-16 03:25:26 +01:00
ericgfwong@hotmail.com
3198faf3d9 Merged Atmos Refilling and Monitoring rooms: https://dl.dropbox.com/u/831776/refill4.png
Added blast doors over CE office
Added Atmos lockdown button to CE office
Moved Hypospray into CMO's locker

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5323 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-15 04:11:58 +00:00
giacomand@gmail.com
cb3216f9fd -Fix for facehuggers runtiming.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5310 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-13 21:00:14 +00:00
ericgfwong@hotmail.com
d0d506252c 2.1.0 mapping fixes.
-Added missing door to chemistry
-Added missing welding goggles to R&D
-Fixed piping error that caused toxins mixing to bug out
-Added more biohazard shutters to Science
-Reversed direction of toxins mixing pipes
-Re-enabled reagent scanner function in toxins PDAs
-Added missing disposal pipe under Mining Dock door

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5308 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-13 18:23:11 +00:00
ericgfwong@hotmail.com
2d54b4c870 Robotics is now a full Science department.
Completely remapped Research Division, Robotics, Medbay, and the Library.
Partially remapped Cargo Bay, Mining Dock, Engineering, and Atmospherics.

APC access renamed to Power Equipment. Assigned to SMES room door and PA shutter controls.
Delivery Office access renamed to Cargo Office and given to miners.
CE loses robotics access.
Roboticists and geneticists get Science corridor access
HoS and HoP get construction access (Engineering/Atmos lobby) and cargo office access (cargo lobby)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5304 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-13 05:51:56 +00:00
petethegoat@gmail.com
5bbd589711 Committed Flashkirby's inhands for tasers, eguns, nuclear eguns, and pulse rifles. Thanks!
Updated those guns to work properly with the new inhands.

Removed a useless esword proc define.

Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5302 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-12 22:55:05 +00:00
aussprites
6251ff6ea2 fixing typo with path.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5300 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-12 16:24:18 +00:00
petethegoat@gmail.com
dde9d121a2 Fixes issue 1154. Slime Jam Not Appearing
Nerfed the janicart ricochet chance a bit.

Removed the coolness check from the det revolver.
Removed the det revolver from the map, and made it spawn in his locker.
You can now modify the det revolver to fire .357 with a screwdriver.
Fixed the det revolver having one round too many. S&W Model 10 only has six shots.

Updated some guncode, mostly just adding proper text styles.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5297 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-11 22:01:25 +00:00