Commit Graph

1979 Commits

Author SHA1 Message Date
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
Hawk-v3
d1fbc74a11 Merge pull request #2145 from GauHelldragon/bleeding
Seedbags!
2013-01-05 15:56:34 -08:00
Chinsky
24a02f90b9 Ported coats pockets 2013-01-04 05:31:14 +04: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
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
cib
438226c7c8 Fixed another graphical error with crew manifests. 2012-12-24 21:20:17 +01:00
cib
39b12b280a Fixed a few problems with PDA crew manifest. 2012-12-24 21:13:29 +01:00
cib
9ccfe7e310 Crew manifest now shows whether a crew member is SSD. 2012-12-24 21:03:26 +01:00
Hawk-v3
9e96fa8aca Merge pull request #2099 from Rowtree/master
Camp Redacted - My map that cib wanted me to upload
2012-12-22 08:25:15 -08:00
GauHelldragon
0a5aeb2233 Cane Sprite Fix
fixes issue #2017
2012-12-19 12:37:58 -08:00
cib
9a6cc83f48 Made the cleaver be a sharp weapon, so you can decapicate with it. 2012-12-18 18:10:28 +01:00
Cael_Aislinn
50c4c120ba space ninja candidates have a timed popup asking the player if they accept (using ShadowDarke's sd_Alert), minor formatting cleanups
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-15 12:39:22 +10:00
Cael_Aislinn
c8f603cebd WIP stuff for skin styles sprite accessory
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-01 18:07:02 +10:00
petethegoat@gmail.com
d9480a1407 New unarmed beartrap sprites by Cheri.
Slightly improved beartrap code while I was there, mostly standardisation and formatting stuff as usual.

Fixed the Chaplain's PDA spawn.

Reduced the chance of stealthy hulk wall smashing. All but one of the messages will attempt to go over the radio now.
Changed hulk resist text colour to red because it was barely readable in green.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5191 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 20:57:08 +00:00
petethegoat@gmail.com
c69f0cab36 Removed /obj/effect/deskclutter at last.
Updated all maps. (and updated stationCollision.dmm to have new hivebots, cmon kor)

Removed the action button from the flare, as you only ever turn it on once.
Removed a bunch of unused sprites in items.dmi.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5190 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 19:58:28 +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
giacomand@gmail.com
43e06e4ebb AIs in intellicards will not be able to move their camera anymore. Limiting them to their own core vision.
Committing Zelack's cleanup and fixes from here:
http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=11056

Plantbags now correctly pick up plants from trays.
Using a hoe or injecting reagents updates the tray icon.
Plant Analysers now work on seed bags.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5173 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-23 23:01:04 +00:00
giacomand@gmail.com
f1d24f27f9 Simplified Detective.
-Changed the focus from the high-res scanner to the regular scanner. It will simply scan the fingerprints and display them to the detective. For extra functionality, it'll store it's findings in a log and then you can print it out in a report by using attack_self().

-Detectives can now use the medical computer.
-Removed the pda forensic scanning functionality.
-Got rid of now useless high-res scanner computer. Got rid of the now useless fingerprint cards.
-Added a medical computer to the detective's office and replaced the useless medical cabinet with an empty one.

Other

-Got rid of diseases magically moving down a stage.
-Optimized playsound()
-Added an attack_self() to sprayers so that you can change the reagent use of them between 5 and 10.




git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5168 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-23 00:39:18 +00:00
d_h2005@yahoo.com
13c2f29555 Adds brooms, by request! They don't do anything special yet. They can spawn in the theater, and there's one on the wizard's den.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5158 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-22 02:28:43 +00:00
petethegoat@gmail.com
0c9195fbe4 Fixes issue 1097. Shaft Miners not getting pda
Fixes issue 1118. duplicating trashbags
Fixes issue 1117. evidence bag issues

Syndie shuttle can now travel to mining and the tcomms sat.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5152 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-21 17:17:00 +00:00
petethegoat@gmail.com
b67262b32b Ported over BS12 style cameras, which photograph a 3x3 area. It's fuckin radical.
Removed /obj/item/weapon/camera while I was at it (unused).
New cameras are in modules/paperwork/photography.dm.
Standardised folder and paper naming a leetle bit.

Added a new gamekit sprite, also from BS12.

Path changes!
/obj/item/weapon/camera_test > /obj/item/device/camera

Updated all maps with the path changes, excepting oldstation.dmm.

Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5116 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-18 23:41:37 +00:00
giacomand@gmail.com
a0e8bb51e0 -Increased the amount of units the sprayer used to make water slippery again.
-Added a verb to empty the contents of the sprayer onto the floor.
-Admin spawnable only poisonousness apple added.
-Apples will always be eaten in one bite, to balance it, the apple can only hold 20 reagents now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5104 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-18 02:13:00 +00:00
aranclanos@hotmail.com
0258d5be22 -Changed all minerals path from /obj/item/stack/sheet to /obj/item/stack/sheet/mineral. (This change excludes glass, Rglass, metal and plasteel)
-Reduced the chunks of code about minerals in door_assembly.dm

Preeeetty much this commit is just to update all the files to the new path of the minerals. From here, if I can, I'll start changing one by one to remove the huge chunks of code.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5087 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-16 15:00:09 +00:00
Ater Ignis
46bd2ce7e6 human icon generation update, tajarnan darkseeing
*lying icon generated from standing one
*sprites for dismembering major races (tajarnan,skrell,soghun)
*tajarnans can see in darkness better than others
2012-11-16 15:19:20 +04:00
d_h2005@yahoo.com
34905c08d4 Adds kudzu plants, which can be grown in hydroponics trays. They are only obtainable by injecting mutagen into a tray with lots of weeds.
Glowberries have uranium inside them now instead of radium, which caused overlap since glowshrooms also had radium.
Also tweaked cocoa pod sprites a little bit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5081 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-15 23:56:28 +00:00
elly1989@rocketmail.com
25b61bae72 Removed the infra_sensor define for noddie.
Integrated the sql and standard admin_rank stuff a little. Still needs some work.
Permissions Panel has a sexy floating search bar. The scripts and stylesheets are external files which will be sent to every client at connect, so they can be used in any panel you wish with no additional overheads.

If there are any bugs with the permissions panel (particularly the search bar) please let me know. thanks.

rights2text now has a seperator argument. It defaults to "", but can be any string, for instance "<br>"

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5080 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-15 20:35:37 +00:00
cib
0d03f87958 Made autopsy age estimates use station time. 2012-11-14 21:40:46 +01:00
petethegoat@gmail.com
1a4d38dfab Added stomping sound effects to the mech toys. Thanks to Skasi for the idea.
Click them inhand to make a stomp, and click them with your other hand to make a turn.

Added a cooldown to riot shield bashing, as it does actually seem to cause lag. Kor was right! Who knew?

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5066 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-14 20:37:43 +00:00
petethegoat@gmail.com
242cd37c4b Hulks now only yell when breaking shit. They have a 2/5 chance of yelling over the radio.
Replaced the vault katana with a replica.

(svn actually managed a map merge, if it's broken please just revert to r5064's map, and replace the katana in the vault with a replica)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5065 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-14 19:41:38 +00:00
cib
7ae7099098 Ported autopsy. 2012-11-14 20:31:31 +01:00
johnsonmt88@gmail.com
b86d90c6c2 Couple of bugfixes:
Wizards can no longer cast spells when muzzled. Fixes issue 843.

You can no longer take bags of holding or mechs to the clown planet. Fixes issue 1061.

Removed the infared sensor from the autolathe construct list. Fixes issue 1092.
- The infared sensor already does nothing, the code for it seems to have been removed ages ago, so there's no harm in doing this.
- Commenting out the define caused a few problems that I couldn't quite figure out. I'll leave it for now with a warning.

Removed the ability for pAI's to set arrest status. Dead players really shouldn't be allowed to grief people like that. Fixes issue 1093.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5060 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-14 01:17:40 +00:00
cib
d62aa1425f Fixed a few more bugs with genetic side effects. 2012-11-11 18:41:40 +01:00
cib
de95f7e8cc Small bug fix for side effect list generation. 2012-11-11 18:23:44 +01:00
cib
eb49378575 Added genetic side effects. 2012-11-11 18:15:12 +01:00
baloh.matevz
2f57200e82 - Fixes the broken population logging
- The current, file-based ban system is now a legacy system, the use of which is strongly discouraged for servers, which are constantly online.
- Added a database-based banning system, with a new baning panel, accessible through the 'banning panel' verb. Servers, which use this new banning system, will get the new panel up even if they use the old 'unban panel' or 'display job bans' verbs. These remain there for legacy support purposes. (Panel screenshot below)
- The most notable benefits of the new system are the ability to add offline bans, meaning the person does not have to be connected for a ban to be applied to their name. The second benefit is the ability to look up all previous bans that the person had.
- The major disadvantage is the complete incompatibility between the old and new system, meaning you have to either do a lot of copy-pasting or playing around in code to sync the old system with the new one. Servers upgrading to this system might want to consider a purge of all bans, if they don't want to go through this. Due to the incompatibility, there are no transition tools provided. Please contact me (errorage/rageroro) in #coderbus for help in syncing your database. The /tg/ legacy and database systems have been synced.
- The server configuration defaults to use the legacy system, as the new one requires the database to be set up. Please hash BAN_LEGACY_SYSTEM in config.txt as explained, to use the new system. If the database connection fails, the server reverts to the legacy system.

If any bugs or errors appear with either the legacy or new ban system, please let me know ASAP. The same applies if there are any syncronization problems between the legacy and new system, resulting in banned people unbanned or unbanned people banned.

Panel screenshot:
http://www.kamletos.si/new%20ban%20panel2.PNG

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5034 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-11 05:39:09 +00:00
baloh.matevz
c870d5e158 - Prayer visibility now starts on, as it should.
- Fixed pulse rifle, energy sword, blackhole and mob spawning
- Fixed 'reload admins' not properly updating the 'admins' list, which made adminwho fail, along with some other things.
- Fixed a bug, which prevented admin from even being loaded properly in some circumstances, in the database admin system.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5027 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-07 23:49:54 +00:00
baloh.matevz
abad9978b2 - Fixed the revision number not showing properly. Hopefully it's fixed for good this time, as it works off of logic, instead of line numbers.
- Standardized the database library code
- Deleted a few unused database related files (karma and forum activation), so they won't get in my way later. They work off of no longer existent database tables.
- Made it so the server maintains a constant connection with the database, which is established on world/New() and never broken, until the server ends. If 5 consecutive database connection attempts result in no connection getting established, the server will not attempt any more connections. Made all existing database connections use the global continuous connections. Currently we need two, as we have two databases, but the old database is going to get moved into the new one.
- Fixed the spaghetti-like report in the permissions panel, which happened when someone had many permissions enabled.
- Added database connection reports to display to dream daemon on server startup.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5015 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-06 17:21:13 +00: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
baloh.matevz
0a2a9362fe - Added a speach_probability variable to parrots, which starts out at 10. It decreases over time, meaning that while it's speach chance is initially prob(10) in each life cycle, as soon as it succeeds, it will be prob(9) and so on, until it eventually gets to prob(1). In effect this reduces the amount of Poly spam.
- Increased the time between vending machine adverts from 60s to 600s = 10 minutes. In addition, I set it so a newly created vending machine assigns a random time for it's first message to be displayed to ensure that all vending machines don't say their message at the same time.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4981 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-29 19:14:51 +00:00
petethegoat@gmail.com
ce8d8be416 Made mousetraps an assembly.
The path has changed from /obj/item/weapon/mousetrap to /obj/item/device/assembly/mousetrap
Deleted mousetraps.dm, and removed the original define from weapon.dm

Added a new /obj/item proc, on_found(). It's called when pockets are emptied, and whenever someone looks in a storage item. Currently used only by mousetraps and facehuggers~

Updated the map with path changes.
Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4969 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 16:39:52 +00:00
elly1989@rocketmail.com
b1fdee2e32 Changed some global_list stuff:
>tried to make the comments less confusing.
>Removed the procs for rebuilding the lists (they weren't meant to be used and half were broken anyway).
>added a directory. It maps ckey to client like so directory[ckey] = client. It could be used for PMs, banning, and various other admin tools rather than using \ref[]
>var/list/admins is now a list of clients whom are admins.
>var/list/admin_datums is what var/list/admins used to be. A map from ckey -> admin datum
Most of this is so I can add modular admin ranks in a non-horrendous way and fix some existing issues.
>var/list/client_list is now var/list/clients (laziness sorry)
>removed some needless loops and stuff.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4951 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 20:11:39 +00:00
elly1989@rocketmail.com
7b720a20b6 >Moved most of the helper procs into code/__HELPERS. If you see ANYTHING generic enough to be a helper proc just throw it in there and help purge the copypasta 5ever
>Replaced dd_text2list, dd_text2listcase, tg_text2listcase and tg_text2list with text2list and text2listEx. text2list will return a list of each and every character in the string if you set separator=""
>added return_file_text(filepath) which returns text from a file after doing some checks: does the file exist? is the file empty? It prints helpful error messages to the world.log if it runs into problems
>Replaced dd_file2list(filepath, seperator) with file2list(filepath, seperator). It just calls text2list(return_file_text(filepath), seperator). rather than copypasta
>Replaced time_stamp() so it's not as retarded
>Lots of the world setup stuff uses file2list now, rather than file2text -> sanity -> text2list
>Added error() warning() testing() procs. These print messages to world.log with a prefix. e.g. ## ERROR: msg.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4948 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 14:39:36 +00:00
Cael_Aislinn
01d3e3bf79 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	code/datums/disease.dm
	code/modules/reagents/Chemistry-Reagents.dm
	icons/turf/areas.dmi
	maps/tgstation.2.0.9.1.dmm

yep, this time going to merge map updates before making map changes >.>

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-21 01:25:04 +10: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
giacomand@gmail.com
66a250ec58 -Fixed Issue 1021 - Rather simple solution but it's a shame I have to do it this way.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4918 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-20 03:46:11 +00:00
cib
fafe46e197 Added internal wound surgery. 2012-10-18 13:32:45 +02:00
petethegoat@gmail.com
d8c376188c Moved the tank dispenser define out of defines.
Changed the tank dispenser path from /obj/machinery/dispenser to /obj/structure/dispenser.

Fixed a bedsheet bin bug.

Updated the map and away missions.
Removed assistantChamber.dmm and desert.dmm.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4906 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-17 22:43:58 +00:00
giacomand@gmail.com
3b95730028 -Committed RavingManiac (Smoke Carter)'s Roros laying eggs.
http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=10501
-You can insert the Auth Disk by clicking on the nuclear bomb.
-Changed how aliens are selected. It will filter the list of possible candidates by checking for players who aren't inactive for more than a minute. If no possible candidates are found, it increases the filter by another minute. It does this 5 times before giving up.
-Alien embryos cannot have carriers and they are more likely to infect someone.
-The time it takes before a larva bursts is increased a bit.




git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4897 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-17 06:04:25 +00:00