Commit Graph
4753 Commits
Author SHA1 Message Date
Cael_Aislinn 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
Cael_Aislinn 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
Cael_Aislinn 09a9c7458f runtime fixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-14 21:46:12 +10:00
Cael_Aislinn cf6aadef09 remove some unused files, tick barsigns.dm and removed duplicate definition
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-14 21:23:47 +10:00
Cael_Aislinn 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
Chinsky f22749df04 Merge branch 'adminstuff'
Conflicts:
	code/modules/admin/admin_verbs.dm
2013-01-12 23:48:03 +04:00
Chinsky 18a5554da5 Merge branch 'secfashion' 2013-01-12 22:50:22 +04:00
Chinsky dc2f77ddd0 Merge branch 'cult' 2013-01-12 22:30:56 +04: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
d_h2005@yahoo.com 2855cd6237 Fixes issue 1211 - Invisible toasts were due to a naming mismatch. (step it up kor)
-New sprites for the border firelocks!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5514 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-11 05:58:21 +00:00
Chinsky e55e8fc3a3 Added verb for admins to create additional job slot. 2013-01-11 04:22:05 +04:00
petethegoat@gmail.com 1aaee90154 Updating the conjure spell to just use paths instead of strings.
Removed the needless Del() from event.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5512 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-11 00:08:17 +00:00
petethegoat@gmail.com f27399bcd5 Added a new events system!
The old one still exists, mainly so the associated admin buttons still work.
At some point I'll add a nice little panel for event stuff and remove the old procs.

event.dm is pretty well commented, and it should be pretty easy to figure it out.

Casualties of the change are space dust (which should probably be implemented separately if we want it back), the black hole event (which was awful), space ninjas (which didn't turn up), ionstorms (the non-admin ones sucked anyway) and CLANG, which I will probably add at some point, if no one else does first.
Also, I removed pierott's throat from the disease outbreak list. f that s.

Thanks to Sukasa and BS12, as my system is loosely based off of theirs.
Thanks Giacom for help with structuring and especially commenting this.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5511 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-10 23:45:57 +00:00
Chinsky 4f173c52a8 Good God, cult code is atrocious....
For now made all words into one list, instead of separate vars for each.
Brought back awesome Urist runes. Down with crayon doodles!

Need to look into making rune NOT check what rune it is EVERY TIME it is activated... making subclasses or some shit like that.
The more I stare in that code the louder screams in my head, maybe that's intended?
2013-01-11 02:01:23 +04:00
sieve32@gmail.com d64186ec9b -Now instead of just giving an angry message, any living mob with a client and the nuke disk that hits a transition on Z1 on them will have their momentum reversed, effectively sending them back where they came from. (Dead and clientless mobs still have the disk deleted from them)
Fixes Issue 1183

-Most game-specific messages now print to all non-new_player mobs instead of the world, round-end reports are unchanged but request consoles and other announcements will not be heard by people in the lobby any more
Fixes Issue 1158

-Tweaked the temperature resistance of mechs to be more inline with current fires. Most mechs protect almost as well as a full fire suit, and the firefighter mech is just over 2x more effective
Fixes Issue 1027

-False-walls can no longer be fixed when on top of a dense turfs
Fixes Issue 1196

-Tweaked how damage was read for CPR and self-examining so you can't perform CPR on yourself at 100 damage
Fixes Issue 1202

-Made stun-glove construction use the cable/Use() instead of just amount-2, so you can no longer get 0 amount coils
Fixes Issue 1206

-Glass reagent containers and droppers now log attacks like syringes do, with the list of reagents
Fixes Issue 1234

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5508 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-10 19:07:02 +00:00
aranclanos@hotmail.com e6ac192056 Runtime fix for trying to blow traitor borgs, I just changed a usr for a src whooooo
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5506 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-10 16:35:55 +00:00
Chinsky c15b5aee0f Changed way dripping blood works a little.
Now there could be 5 drips on a tile.
Drip #6 makes it into blood puddle.
Now if you bleed out you won't lie in 3 drops of blood, bubt in proper puddle
2013-01-10 14:23:01 +04:00
Chinsky 08b52b0f04 Added alternative uniform for Security officers and Security armor vest. 2013-01-10 14:21:22 +04:00
aranclanos@hotmail.com 334347b4bb Runtime fix for slimes trying to eat a mob that doesn't exist anymore
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5503 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-09 19:17:28 +00:00
aranclanos@hotmail.com 836f0e2584 Runtime fixes for admins using simple transformations on ghosts, and the mobs getting dna = null
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5502 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-09 18:21:39 +00:00
petethegoat@gmail.com 7500ac50f8 Committing two proposed commits by Malkevin: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11499 & http://forums.nanotrasen.com/viewtopic.php?f=16&t=11717
Owl mask is now a gasmask.

Adds the missing icons for the arrest statuses of Parolled and Released, as well as a little blinking icon for chemical implants to hud.dmi
And adds them to hud.dm so they show in game also.

Updated the changelog.

Path change:
/obj/item/clothing/mask/owl_mask > /obj/item/clothing/mask/gas/owl_mask

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5501 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-09 12:53:42 +00:00
petethegoat@gmail.com 21b8f77d2a Fixed capitalisation on alien ventcrawl.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5500 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-09 00:32:42 +00:00
Kortgstation@gmail.com 3cb3c1ea0d Fixed being able to remove canremove = 0 items by trying to place an object on a person.
Fixed more adamantine golem icons.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5499 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-08 23:15:28 +00:00
petethegoat@gmail.com 61098e961b Committing a fix by SuperSayu for emptying plantbags into the smartfridge, and trashbags into disposals.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5498 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-08 22:22:47 +00:00
petethegoat@gmail.com f363948dc6 Committing some of SuperSayu's misc patches: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11671
* Smart fridge smartly shows (x5)(x10)(x25)(All) vend options based on quantity stored
* Gateway fix: When the away mission gate is calibrated, you will come out facing south. Matters somewhat when walking through in an exosuit. Also one pedantic text edit.
* Drink volume estimation:
* * Moved "half-full" to 26%-66% rather than 25%-49%
* * Moved "almost full" to 67%-90% rather than 50%-111% (1/.9)

Also removed /obj/item/weapon/directions and /obj/item/weapon/paperscrap.
They've been replaced by /obj/item/weapon/paper/crumpled and /obj/item/weapon/paper/crumpled/bloody.
Updated 2.1.0 and all away missions.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5497 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-08 20:58:31 +00:00
petethegoat@gmail.com 11b17c4442 Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746
Standardization of the object tree and some modified functionality.
Moved a lot of storage/*_kit and similar boxes to storage/box/* ; most of these can now be found in boxes.dm. First aid kits remain a separate item type.
Replacement Light boxes pick up lights (for example broken ones) when used on them
Moved weapon/secstorage to storage/secure
Moved plant bags, ore satchel, trash bag, and sheet snatcher to storage/bag, in bags.dm
Fixed reagent_containers and snacks to pass through attackby() so the use_to_pickup code works. This affects plant bags, trash bags, and pill bottles.
Dice packs are now pill bottles, and all pill bottles can pick up dice.
Added error handling to uplink/generate_menu() so that one mistyped string doesn't bork the whole syndie uplink menu, since strings cannot be type-checked at compile time.
Cigarette packs and crayon boxes are now storage/fancy, however they retain existing update_icon() code.
Added a comment to storage.dm so that future people know where to look for use_to_pickup and allow_quick_gather code.

Updated all maps.

I've tried to test this thoroughly but I wouldn't be surprised if there were a few lingering issues. Try not to panic if you encounter any.

Full (i think) list of changed paths:
/obj/item/weapon/storage/flashbang_kit	> /obj/item/weapon/storage/box/flashbangs
/obj/item/weapon/storage/body_bag_box	> /obj/item/weapon/storage/box/bodybags
/obj/item/weapon/storage/chemimp_kit	> /obj/item/weapon/storage/box/chemimp
/obj/item/weapon/storage/trackimp_kit	> /obj/item/weapon/storage/box/trackimp
/obj/item/weapon/storage/seccart_kit	> /obj/item/weapon/storage/box/seccarts
/obj/item/weapon/storage/handcuff_kit	> /obj/item/weapon/storage/box/handcuffs
/obj/item/weapon/cigpacket		> /obj/item/weapon/storage/fancy/cigarettes
/obj/item/weapon/storage/mousetraps	> /obj/item/weapon/storage/box/mousetraps
/obj/item/weapon/storage/PDAbox		> /obj/item/weapon/storage/box/PDAs
/obj/item/weapon/storage/id_kit		> /obj/item/weapon/storage/box/ids
/obj/item/weapon/storage/lightbox/mixed	> /obj/item/weapon/storage/box/lights/mixed
/obj/item/weapon/storage/donkpocket_kit	> /obj/item/weapon/storage/box/donkpockets
/obj/item/weapon/storage/beakerbox	> /obj/item/weapon/storage/box/beakers
/obj/item/weapon/storage/syringes	> /obj/item/weapon/storage/box/syringes
/obj/item/weapon/storage/gl_kit		> /obj/item/weapon/storage/box/rxglasses
/obj/item/weapon/storage/diskbox	> /obj/item/weapon/storage/box/disks
/obj/item/weapon/storage/stma_kit	> /obj/item/weapon/storage/box/masks
/obj/item/weapon/storage/lglo_kit	> /obj/item/weapon/storage/box/gloves
/obj/item/weapon/storage/lightbox/bulbs	> /obj/item/weapon/storage/box/lights/bulbs
/obj/item/weapon/plantbag		> /obj/item/weapon/storage/bag/plants
/obj/item/weapon/storage/satchel	> /obj/item/weapon/storage/bag/ore
/obj/item/weapon/trashbag		> /obj/item/weapon/storage/bag/trash

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5494 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-08 19:11:56 +00:00
petethegoat@gmail.com ef8369409e Committed Cael Aislinn's proposed commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11641
- Xenos suit and helm (completely obscuring, and almost indistinguishable from drones) (admin spawned only for now). 
- Facehuggers now have different icon states for being thrown and after impregnation. 
- New death, unconscious and sleeping icons for aliens. 
- New icon (and projectile type) for neuroxotin. 
- New infection overlay images for telling aliens about pregnant humans (3 icons, showing the progression of the infestation). 
- New system for handling alien impregnation (alien embryos are an object inside the mob, instead of a disease). 
- Players can be operated surgically to remove the alien embryos (targetting the chest: scalpel, surgical saw, hemostat, retractors. If the embryo is nearly fully developed, it might come out alive though. 
- Corgis can now get impregnated. 
- There is a short animated overlay of a chestburster when it comes time to burst chests. 
- Alien larva now have three different icon sets, depending on their growth (25% they are bloody and pale, 25% - 75% they are pale, 75% onwards they are deep red).


Fixed up table smashing, and added rack smashing in the same way.
Added new north/south facing for the large alien queen.
Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5493 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-08 16:30:45 +00:00
Cael_Aislinn 6aa245f716 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	code/game/gamemodes/gameticker.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-08 23:08:52 +10:00
Cael_Aislinn 2ad36df02a fixed up a bunch of miscellaneous derps that broke compiling (several unticked files, as well as one mistakenly removed file)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-08 23:03:48 +10:00
Kortgstation@gmail.com 6ae1348790 Fixed the slime core runtimes.
Made the summon extract NPCs all have the same faction so they will attack players, not eachother.

Gave victims of the advanced mutation toxin universal_speak

Fixed adamantine golem sprites

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5492 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-08 00:03:13 +00:00
giacomand@gmail.com 53f11d0137 PACMAN generators will drop fuel. Added an eject button too. Fixes 1232
Gave human made cameras a c_tag on construction. Fixes 1222

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5491 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-07 23:35:18 +00:00
Kortgstation@gmail.com 0983ee8912 Added four new slime types (sprites by Reisyn, SuperElement, and LePinkyFace)
Fixed the backwards pumps in misc research, shuffled the xenobio surgical area around to be easier to use.

Fixed being able to strip items with canremove = 0

Added a new mutantrace that ties into the new slime extracts (sprites by SuperElement)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5490 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-07 21:22:44 +00:00
giacomand@gmail.com 1434a0154c -Added a config option, which defaults to off, which will let the gamemodes Wizard, Malf and Rev carry on playing without round interruption. Meaning...
The wizard round will carry on even if the wizard dies
The malf round will carry on even if the AI dies. When the AI dies the shuttle will become callable. If the AI takesover the station or causes the station to explode, the round will end like normal.
Rev will carry on playing even when all heads or all rev heads die. The shuttle will become callable when this is true.

-Properly fixed the PDA runtime without adding special snowflakes.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5489 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-07 20:53:03 +00:00
aranclanos@hotmail.com 2f90aa3959 Runtime fixes for using sechuds to examine people with wallets and null PDAs.
If the selected mob is wearing a PDA, it will pick the PDA owner instead of the ID inside of the PDA.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5488 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-07 19:36:59 +00:00
Chinsky 7f1e7ca954 Moved most admin verbs from admin_verbs_default to admin_verbs_admin.
Reason is to make moderators possible without Game Masters losing basic admin verbs.
Now default admin verbs only have bare bone functionality, and each next permission adds more.
2013-01-07 20:41:45 +04:00
Cael_Aislinn 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
Cael_Aislinn 986652ae3e Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-01-07 22:17:07 +10:00
Cael_Aislinn 3186ff344e added dwarf fortress music for the title screen and mining asteroid
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-07 22:13:24 +10:00
aranclanos@hotmail.com 75b8a38977 Runtime fix for inputing the number of sheets that you want to add into a protolathe, when the sheet doesn't exist.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5486 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-07 12:06:31 +00:00
Cael_Aislinn e263f273f1 cleanup and re-integration of character creation options and client preferences, tiny bit of WIP work on skin_styles, gave soghun access to a couple of new hairstyles, fixed a longstanding bug with supply_packs, update some map paths, some work to integrating mod rank with new tg permissions system (not finished)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-07 21:39:34 +10:00
aranclanos@hotmail.com bd6657ebca Runtime fix for delivery chutes checking the vars of a weapon/dummy before cancelling the proc in Bumped()
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5483 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-07 10:11:48 +00:00
Zuhayr 0c3f3e84ef Whoops, forgot to add the designs.dm file. 2013-01-07 14:51:06 -08:00
Zuhayr f7f014df6f Added binary talk for positronic brains, fixed mech destruction error, added positronic brain design to protolathe. 2013-01-07 14:47:29 -08:00
d_h2005@yahoo.com c3c1c94d7e -Adds sprites and defines for departmental armbands, attachable to jumpsuits.
-Fixes backwards police-baton inhand sprites.
-Nudges the lusty xeno poster over a few pixels, so it fits better in-game.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5481 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-07 03:14:35 +00:00
Zuhayr 45f0c2823d Removed an errant 'else' and included the baystation12.dme. 2013-01-06 15:41:02 -08:00
baloh.matevz@gmail.com 0a1b16f620 - Moved access definitions for jobs to the job datum. In addition, I added an extra access definition: minimal_access and access. Minimal access is intended for servers with large populations. All jobs have the bare minimum access they need to survive. access, on the other hand, is a far more generous list of accesses, intended for servers with lower populations, where players are expected to do more than just the job they were assigned. Also for servers which don't want to allow people to hide in their own ultra secure departments, where no one can get to them.
I did not go through the list to assign 'access' yet, so the two are currently identical.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5479 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-06 16:38:45 +00: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
giacomand@gmail.com f614122778 -Added a new button to NTSL's IDE which will clear the server's memory.
-Changed the broadcast function using a precreated human. The human would still be existing and a new one was created for every use of the broadcast. Garbage collecting it was almost impossible and deleting it everytime a broadcast is made would be laggy so I modified the broadcast code to not need a mob reference.
-Added some checks in the events.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5477 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-06 06:55:52 +00:00
Kortgstation@gmail.com bc56419710 Fix for slime steroids not working.
Fix for slime monkey spawning only spawning one monkey (it spawns 3 now).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5476 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-06 01:27:58 +00:00