Commit Graph

118 Commits

Author SHA1 Message Date
Chinsky
18a5554da5 Merge branch 'secfashion' 2013-01-12 22:50:22 +04:00
Chinsky
08160b5111 Added alternative security uniforms to wardrobes.
Security armor vest now has different sprite.
2013-01-12 22:48:18 +04:00
Chinsky
8a3758af72 Morgue trays now can open in different direction depending on how they are placed.
No way to rotate ingame though, mapping and badminning only.
2013-01-12 09:32:08 +04: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
Hawk-v3
62bd0e8a68 Merge pull request #2146 from comma/master
Violence and carnage
2013-01-05 15:58:45 -08:00
Hawk-v3
d1fbc74a11 Merge pull request #2145 from GauHelldragon/bleeding
Seedbags!
2013-01-05 15:56:34 -08:00
Zuhayr
6751c1a6be Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-01-06 03:12:48 -08:00
Chinsky
859ae76d8d Added a chance for stool breaking over someone, stunning them and dealing more damage. 2013-01-04 16:24:35 +04:00
Chinsky
bc17911eac Added ability to slam people against the tables 2013-01-04 09:06:33 +04:00
Chinsky
1bb6a7bdb1 Added ability to bash people against the windows 2013-01-04 08:36:41 +04:00
Chinsky
76efcdb254 Added ability to pick up stools. 2013-01-04 07:42:44 +04:00
Chinsky
24a02f90b9 Ported coats pockets 2013-01-04 05:31:14 +04:00
GauHelldragon
17317e3ff6 Fixes closets and destructive analyzer
You can no longer load your robot modules into these. Fixes #2138
2013-01-03 16:08:46 -08:00
Chinsky
5e24bc8f34 Added surgery caps. 2013-01-03 02:46:15 +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
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
Cael_Aislinn
2f7baa26f8 antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-01 17:49:34 +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
dbd759477e Improved window code, mostly formatting and styles, but also general improvements.
I've tested it a fair bit, but there may be bugs, so please report those if you run into them.

Added an ismetroidadult() helper

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

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5187 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 17:09:38 +00:00
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
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
aranclanos@hotmail.com
ab9c532ae8 - Fixed some ugly runtimes regarding mineral doors (Not mineral airlocks)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5151 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-21 14:53:12 +00:00
petethegoat@gmail.com
6db2d55bbd Improved rigged crate code for some anon on /vg/
Made syringe guns do no damage on behalf of coderbus.

Added some new book sprites and updated some books.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5134 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-20 16:06:14 +00:00
johnsonmt88@gmail.com
7dad5e0af2 Moved shuttle_engines.dm to the unused folder as it has apparently been unticked for ages.
Moved the modified wish granter and meat grinder from Brotemis' away mission map (wildwest) into wildwest.dm in the random z-level folder. This way if we get to rotating through different maps, we wont have leftover unused code laying around.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5118 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-19 01:00:32 +00:00
petethegoat@gmail.com
8594527d2d Updated signs.
Fixes issue 1015. Layering issue, false wall, station map

Path changes!
/obj/effect/sign > /obj/structure/sign
/obj/effect/decal/poster > /obj/structure/sign/poster
/obj/effect/sign/maltesefalcon1 > /obj/structure/sign/maltesefalcon/left
/obj/effect/sign/maltesefalcon2 > /obj/structure/sign/maltesefalcon/right

Updated all maps (except oldstation.dmm) with the new paths.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5111 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-18 18:43:41 +00:00
petethegoat@gmail.com
0c400d1a75 More fixes for flora because I'm terrible.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5109 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-18 15:48:42 +00:00
petethegoat@gmail.com
a2cb5199c6 Fixed a BUNCH of typos in flora.dm.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5108 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-18 15:26:25 +00:00
petethegoat@gmail.com
e789d6048f Added defines for snow and various snowy flora, including trees, grass, and bushes.
Fixed a mis-indented update_icon in floor/attack_hand(). Asteroid floors and such should no longer change when you click them.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5107 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-18 15:22:13 +00:00
petethegoat@gmail.com
d8c0a0e437 Added crate traps for Cheri.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5103 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-18 00:24:31 +00:00
aranclanos@hotmail.com
5d9f6d4ccd - Fixes the ugly runtimes caused in r5087 about dismantling walls.
- Fixed the mineral of the silver walls. It was by default, metal.
- Fixed a runtime about building airlocks/walls/false walls with only 2 sheets.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5095 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-17 03:50:45 +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
aranclanos@hotmail.com
8af0cf02fd Fixes Issue 1099 - Not being able to build rWalls with plasteel. I slipped it there, sorry.
Deleted beach.dm and moved the code to floor_types.dm, the turf/simulated/beach is now turf/simulated/floor/beach.
Changed the turfs in the holodeck beach to the new type.
Falsewalls and walls have the right descriptions and names now.
'bananium' and 'sand' falsewalls are deleted, we already have 'honk' and 'sandstone', that are the same thing
Deleted a bunch of code that does the same thing in girders.dm (This still needs a lot of work, I'm unhappy of how it ended up)


I'll keep working with sheets of minerals, they are really messy, I think some of them are defined twice (!) and there are large chunks of code that does the same thing when they are used. But, as always, to be continued~

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5073 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-15 09:38:06 +00:00
petethegoat@gmail.com
ad5e92d3cd Fixed a bug where building and deconstructing a wall on top of atmospheric pipes would cause them to disappear.
See issue 1096 for some info, though it's not technically a related issue.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5068 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-14 22:53:08 +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
aranclanos@hotmail.com
440c782a94 - Fixes Issue 910
- Changed mineral walls, they have their own type by mineral instead of a variable
- Now you can spawn the different mineral walls with the game panel
- Fixed the examining in walls, they will now show the text on the 'desc' var

 There are still some stuff out there with mineral walls, ugly chunks of code that does the same thing, two vars that have the same value and stuff like that. All of that will be purged, but, as always, to be continued~

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5061 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-14 13:29:30 +00:00
aranclanos@hotmail.com
dee7b74a45 -Changed turf creations, merging everything to only one proc
-Fixes Issue 1085 - Artificers creating turfs with buggy lighting
-Spells now will use the proper proc to create turfs

Due to the amount of files changed, this is just the 'part one'. The merging in turf.dm is not finished, mineral walls and buildmode are still using the old system. The creation of turfs on the game panel is not using the proper procs yet. Stay tuned for this changes, but now, sleep.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5054 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-13 13:39:00 +00:00
sieve32@gmail.com
ae3b76879e Welp, missed a use() for mineral walls, specifically clown ones. Not much else to say really.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5050 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-13 02:31:56 +00:00
SkyMarshal
ecdb9ab118 Fixed the sillies marked with "skytodo". Removed ONESIZEFITSALL flag as we removed fatness, replaced it with PLASMAGUARD flag as that is what we were using the value as previously. Firedoors should no longer be derpy. The remaining "skytodo"s are places where I have no idea what the fuck you wanted or no idea what the fuck needed done with it. 2012-11-11 14:33:33 -07:00
Kortgstation@gmail.com
ab4c92e066 Using summon guns gives a message to the the user to confirm it working.
Added a new borg upgrade module which requires illegal tech and combat tech to make. It allows you to give them their emagged equipment without fucking with their laws.

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

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

Updated changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5037 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-11 07:43:49 +00:00
aranclanos@hotmail.com
20c1955163 Fixes Issue 1078 - Wood sheets deleting girders
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5016 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-06 18:10:31 +00:00
giacomand@gmail.com
d46775ec87 -Aliens now take x2 as much damage from fire based weaponary, instead of x1.5.
-Doors are now weaker than walls; so normal weapons can destroy them much more easily.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4990 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-02 02:31:16 +00:00
Ravensdale
19bca3e2ef Update code/game/objects/structures/crates_lockers/closets/utility_closets.dm 2012-11-01 15:43:09 -07:00
Ravensdale
ce7e72c367 Fixes what emergency lockers spawn with so masks aren't rarer than diamonds. 2012-10-29 17:11:54 -07:00
elly1989@rocketmail.com
4d9876fd65 Fixes issues with pen bbcode. Replacetext did not work correctly after I changed text2list - (It was missing 'needles' at the beginning of 'haystacks').
>dd_replacetext and dd_replacetext_case are now replacetext and replacetextEx respectively.
>replacetext and replacetextEx works using strings only; it doesn't convert it into a list and then back into a string.

Fixes some dumb-dumbs in textlist and text2listEx
> "<" where there should be a "<="
> no else case for when the separator is longer than the text (causing empty lists to be returned)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4971 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 21:21:17 +00:00
petethegoat@gmail.com
6af0e6ab84 Committing Lisa. God help me if this causes any corgi erp.
Also adding comfy chairs and office chairs to the metal recipes list.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4970 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 18:33:36 +00:00
petethegoat@gmail.com
bc933cc10b Fixes issue 1040. Ability to give mechs all access and remove DNA locks from mechs and more.
(the fix is shitty, but then, so is mech code)
Fixes issue 1043. Safe structure allows users to teleport any item in the game to them

Increases the firefighter heat resistance to 4500.
Removes firefighter.dm, as it was entirely commented out. Firefighters are in ripley.dm.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4968 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 14:51:30 +00:00
giacomand@gmail.com
6a2d78bc94 -Killed the updateDialog lag. I added a check to see if there were any mobs to update, if not it will stop checking until a user uses the machine again. I had to replace all the machine = src and machine = null with procs to help make it manageable. I believe this is one of the culprits causing the server to lag as the round goes on, as more players will interact with machines.
-Atmos delay is now based on active players, to help fight lag for massive player rounds.

-Changed some for(blah in world) loops to use the correct lists.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4958 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-25 19:15:51 +00:00
Chinsky
236780d8c6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-25 03:42:20 +04:00