06809c3651
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
code/controllers/master_controller.dm
code/modules/mob/new_player/sprite_accessories.dm
code/modules/reagents/Chemistry-Reagents.dm
code/setup.dm
icons/mob/human_face.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-01 23:45:13 +10:00
7f05c6fdb3
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/game/jobs/job/captain.dm
code/game/jobs/job/security.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/mob/living/carbon/human/hud.dm
html/changelog.html
icons/obj/items.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-23 01:02:27 +10:00
104bc8dd98
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/datums/supplypacks.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/security.dm
code/modules/clothing/spacesuits/rig.dm
icons/mob/head.dmi
icons/mob/suit.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-23 00:48:07 +10:00
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
f061470c3b
money tweaks
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-22 23:16:23 +10:00
0c2c999f74
money! re-added atms, created account system / accounts database, whole bunch of options for moving money around, some tweaks to spacecash and icons
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-22 17:56:34 +10:00
4d9af5c0a4
Recolored a bunch of objects to make medbay's department colours more clear and consistent. The colours are green/white.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5593 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-21 00:11:48 +00:00
64640450f5
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-01-17 18:20:17 +10:00
d321a3aaf2
removed two more unused files
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-17 18:19:50 +10:00
a5c1cf781a
Merge pull request #2185 from CIB/feature
...
Autopsy scanner fixes
2013-01-16 17:57:35 -08:00
f472e07cc1
Merge pull request #2194 from comma/master
...
Surgeray
2013-01-16 17:57:05 -08:00
aff12feaaa
More fixes to autopsy scanner, issue #2153
...
- Scanner will now print data even when only time of death is available.
- Scanner will reset chemtraces on new patient.
2013-01-15 21:14:06 +01:00
99770a8792
Fixed autopsy scanner defines.
...
Committing map changes for faux.
2013-01-15 20:26:55 +04:00
a8d7e5275a
removed unused WIP file
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-16 00:20:05 +10:00
e423798b8d
removed a bunch of unused files, moved amorphs and meme to workinprogress/cib
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-15 23:29:49 +10:00
6b93cc9c91
added placeholder economic stuff (probably never finish it), added random system-wide events (which are announced at the newscaster when they occur)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-15 21:25:45 +10:00
0f561b141c
Merge branch 'surgery'
2013-01-15 14:30:01 +04:00
6d830af37c
Merge branch 'master' into surgery
...
Conflicts:
code/WorkInProgress/surgery.dm
code/modules/mob/living/carbon/carbon_defines.dm
2013-01-15 13:42:13 +04:00
d532ec9712
add+fix missing files for jungle away mission, re-add missing atmos and security rigs, refactor and cleanup rigs
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-14 23:29:53 +10:00
8581932c57
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/game/objects/items/toys.dm
icons/mob/back.dmi
icons/mob/suit.dmi
icons/mob/uniform.dmi
icons/obj/clothing/suits.dmi
icons/obj/clothing/uniforms.dmi
icons/obj/weapons.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-14 22:14:46 +10:00
1c9b04ec74
copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-14 21:07:16 +10:00
c8032311b5
Merge pull request #2162 from comma/master
...
EMP x Implants OTP... and lots of other things.
2013-01-13 04:29:50 -08:00
3447c61e49
Moved surgery from WIP to modules, since it's not really that WIP anymore.
...
Split one huge file into several smaller ones for readability.
2013-01-13 02:11:06 +04:00
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
d4b3d19793
cleaned up a bunch of away missions, made only the peaceful-ish ones spawn, added my jungle map and susu's research labs map
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-11 14:52:43 +10:00
2e75059c3a
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-01-09 12:45:04 +04:00
7fea186d64
EMP now will have !!FUN!! effects on implants.
...
Affected implants:
-Explosive
-Death alarm
-Tracking
-Chemical
Also added new sound for implant activation.
Fixed derp in implant surgery.
2013-01-09 12:43:22 +04:00
083e9565e0
Fixed engietape requiring both Atmos AND enginering access. Now need only one.
2013-01-08 23:34:18 +04:00
ef129f53ac
Fixed up dept sec so latejoining works. Dept sec also get their snazzy armbands!
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5487 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-07 19:29:44 +00:00
7efc1aafef
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
...
Conflicts:
icons/turf/areas.dmi
maps/RandomZLevels/stationCollision.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-07 22:26:24 +10:00
990090326d
compile fixes and cleanup
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-07 02:36:52 +10:00
7abec8d3bc
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-01-06 12:15:30 +04:00
5f0c39f1cf
Added implant removal surgery.
...
If you fail the step, has small chance of activating implant.
Gives you a sound and ~15 ticks to run away like hell.
Changes I did to other parts to make this possible:
-Implants are now organ-based, not mob-based
-Part of implant working code is moved to appropriate activate() procs
2013-01-06 11:25:53 +04:00
93476a2c16
Finishing touches on Air Alarms, Firedoors, and Central Atmos Control
2013-01-04 22:00:56 -07:00
9cf23741ca
- Fixed department security, so you no longer spawn in walls
...
- Applied some changes that happened to jobs since department security was started.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5467 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-05 03:37:22 +00:00
24a02f90b9
Ported coats pockets
2013-01-04 05:31:14 +04:00
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
5768d6a741
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
...
Conflicts:
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-31 02:01:37 +10:00
20228b12cf
Merge pull request #2117 from SueTheCake/master
...
Away Mission + ERT/Sec/Soghun Rigs
2012-12-29 05:55:29 -08:00
313cd4a495
I'm an idiot and I forgot to change a mob's projectile.
2012-12-29 02:41:51 -06:00
f7249bd519
Added my completed away mission, along with the necessary sprites and code. A Soghun-Compatible RIG suit has also been added.
2012-12-29 01:59:19 -06:00
c270fdb2ba
compile and misc other fixes
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-29 13:23:43 +10:00
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
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
026bbfa3b7
Implemented ghetto surgery tools.
2012-12-24 18:25:02 +01:00
9df91430fd
Merge pull request #2097 from comma/surgery
...
Surgery
2012-12-22 08:27:18 -08:00
b3580e8265
Merge branch 'master' into surgery
2012-12-21 01:07:36 +04:00
3a928012f1
Updated Department Security files to work with the new 2.1.0 map.
...
Updated the relevant readme file
Updated 2.1.0 with some missing air alarms and fire alarms.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5362 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-20 00:28:13 +00:00
96fb7cf14b
Rebalanced spaceacillin metabolism.
...
It used to be something like 1 unit per tick, which only lasted around 2
minutes for 15 units. Now it'll last a bit longer, making it actually
useful.
2012-12-11 13:22:44 +01:00
15a80594a6
Fixed the softcurity readme.
...
Added grabbing cigarettes with your mouth for Malkevin.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5290 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-10 00:56:42 +00:00
Cael_Aislinn