SkyMarshal
b1e9955ea7
Fire update. Should now burn out after a time, and temperature varies on a number of conditions. Fixed a runtime, and made fire work in canisters. Ingame modification of ZAS is now possible again. Firedoors now remove duplicate firedoors on the same turf.
2013-04-11 11:21:46 -07:00
Cael_Aislinn
30a34bbc9f
added an admin proc to check for any inactive players with custom items
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-01 19:15:27 +10:00
Gamerofthegame
f3ba4e4ec6
Opens the ERT debug-command preset for actual use.
2013-02-26 21:25:48 -05:00
Cael_Aislinn
fed198964f
fixed ooc runtime, removed random space in adminpms, removed forced disabling of stat tracking >.>
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-25 13:45:13 +10:00
Zuhayr
1fe4cbb619
Added a mantle and robe for Unathi to wear, added weldermask vision reduction for Unathi helmets, changed instances of soghun to 'Unathi' where needed.
2013-02-20 00:24:26 -08:00
Gamerofthegame
437cca538b
Merge branch 'bleeding-edge-freeze' of https://github.com/Gamerofthegame/Baystation12 into bleeding-edge-freeze
2013-02-18 00:07:40 -05:00
Cael_Aislinn
2b4827692c
tweakfixes to admin PMs
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-18 13:06:07 +10:00
Gamerofthegame
64c72ef969
Adds the ERT to the debug command for adminnery. Not exactly like the pre-merge one, as that was based off something else so I couldn't copy-paste. It should give admins a easier time of making things up, though, and so long as future plans go into effect a admin ought to be able to do it on the fly in less then a minute.
2013-02-17 18:15:07 -05:00
Cael_Aislinn
e6e4b89819
disabled simultaneous admin PM warning
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-13 17:49:48 +10:00
Cael_Aislinn
f29c19e52c
added global PM visibility for mods
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-11 02:51:55 +10:00
Cael_Aislinn
c05b9869e6
restructured/cleaned up how admin-pms are sent (retained original code just in case), made it so that only holders with R_ADMIN can see private messages, added a timeout warning to anyone PMing a player so they dont get spammed (default to 5 seconds, config edited)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-10 21:29:02 +10:00
Cael_Aislinn
0ad89c7953
removed moderators from adminwho, added new globally accessible verb to show online moderators
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-10 21:25:29 +10:00
Cael_Aislinn
15bc6ed7b2
restructured event system, re-merged CIB's event system with TG's
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-10 21:24:31 +10:00
Chinsky
6b10b8a564
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-02-09 23:57:10 +04:00
Chinsky
839500c8fb
Fixed msay links.
2013-02-09 21:42:52 +04:00
cib
934eae1d15
Removes new event code and reinstates old event code.
2013-02-09 18:38:35 +01:00
Chinsky
4d7aa320cb
Due to git tree being fucked up for some reason, manually reapplied many man many fixes.
...
Just got to tip of real tree and got zipball, then unpacked it here.
2013-02-07 07:13:27 +04:00
Chinsky
75341efb38
Missing PM link in msay.
2013-02-07 06:17:48 +04:00
Chinsky
0cce21ca87
Did it get reverted or something... witchery.
...
Anyway, mods jumpy again.
2013-02-07 05:54:27 +04:00
Hawk-v3
1117db050d
Merge pull request #2271 from comma/master
...
Fixes Take Three
2013-02-06 15:47:14 -08:00
Chinsky
4739184104
OH GEE LET'S LET EVERYONE AND THEIR ADMIN OBSERVER MOM USE THESE VERBS NOTHING CAN POSSIBLY GO WRONG.
...
Slapped rights checks on verbs in VV menu.
2013-02-07 03:40:01 +04:00
Chinsky
f9894599cf
Readded Show Skills verb
2013-02-06 07:23:27 +04:00
Chinsky
558a479954
Fix for Command Report runtime.
2013-02-06 07:05:41 +04:00
Chinsky
f4b08b0923
Made adminlog messages not visible to mods again.
...
Return of attacklog spam (now toggleable)
2013-02-06 06:14:31 +04:00
Chinsky
db5b00cd61
Quick fix for mods not being able to access CA from some places
2013-02-05 17:17:39 +04:00
Chinsky
e68dcce602
Msay and adminhelps now go to admins and mods.
2013-02-05 16:44:15 +04:00
Chinsky
7528570b1b
Added verb to toggle deadchat to everyone who can hear it.
...
Mods now can ghostjump again.
2013-02-05 15:51:07 +04:00
Chinsky
5a23ec6485
Fixed asay being visible to moderators.
2013-02-03 00:50:39 +04:00
Chinsky
f4469083b2
Made permission checks for some verbs more TG-compliant.
...
Fixed Edit Appearance verb.
Removed DB verb since we are not using SQL and it'll only confuse admins.
2013-02-03 00:10:29 +04:00
Chinsky
24cf3c2dd0
Merge branch 'master' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/datums/supplypacks.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/mob/new_player/new_player.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Recipes.dm
icons/mob/suit.dmi
icons/obj/drinks.dmi
2013-01-30 16:39:00 +04:00
Chinsky
0c260c2c17
Added rejuv verb and setting OOC event info.
2013-01-28 01:28:30 +04:00
Chinsky
39a6b54a5a
Added admins some verbs that flithy mods were hogging.
2013-01-28 01:25:52 +04:00
Cael_Aislinn
e7c10c44cd
made delay round end work after restart timer has started, made delay verb also delay round end
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-24 15:38:23 +10:00
Chinsky
7f5e8bf595
Return of Moderator III: This is Getting Old.
...
Fixed mods back in, should have all powers they did.
Mod panel is MIA< let them use same admins use, can't do shit without having rights anyway.
2013-01-23 06:27:31 +04:00
Cael_Aislinn
fb2b2a1d52
various compile fixes
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-23 00:43:54 +10:00
Cael_Aislinn
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
johnsonmt88@gmail.com
3ac21339c1
You can now make a single camera use multiple networks.
...
var/network = string is now var/list/network = list().
I've also added a "network_multi" var which is a string. This is specifically for placing cameras on a map that you want to put on multiple networks. Apparently DM's map maker doesn't support lists, so just type them all in as a string and camera/initialize() will take care of the rest.
Input the networks with commas seperating them, for example: "SS13,RD,Secret,Prison,Ect"
I fixed a few issues while editing the cameras on the map as well.
Both maps:
- Re-added the telescreen in the misc research room that got removed at some point. (Thanks to Ikarrus for pointing this out)
- Any room that had 2 cameras (one for each network) were merged into one camera with the new network lists.
- - Permabrig-hallway (SS13, Prison)
- - Every room in R&D (including robotics) (SS13, RD)
- - The bomb testing range (RD, Toxins)
tgstation.2.1.1.dmm:
- Added a missing wire in engineering-sec (Thanks to SuperSayu for pointing this out)
- Fixed some mis-orientated firelocks. (Thanks to Intigracy for pointing this out)
- - The mining door between cargo and mining
- - The door between the hallway and the engineering lobby
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5596 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-22 01:24:09 +00:00
baloh.matevz@gmail.com
f873b86b35
- Small edit to the movement killswitch. The person who enables it will now be allowed to move, so he can try to detect any change to lag.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5572 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-18 03:12:43 +00:00
baloh.matevz@gmail.com
3d0d03a74f
- Added killswitches to say, whisper, me, ooc, adminhelp and pray to try to determine if communication verbs are the cause of the constant lag we're getting. Toggle the killswitch with the 'disable communication verbs' verb, available in debug verbs.
...
- Added killswitches to all Enter() and Entered() procs to try to determine if movement is the source of all the constant lag we're having. Toggle the killswitch with the 'disable all movement' verb, available in debug verbs.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5571 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-18 03:04:46 +00:00
baloh.matevz@gmail.com
5bb06b184c
- Added a killswitch to the master controller for air processing and pipe processing, accessible through two toggle-verbs in debug verbs.
...
- Added a verb that breaks all airgroups into individually processing tiles and a verb that forces a group-rejoin attempt on all airgroups. Once the verb to break all air groups is used, they will not attempt to recreate until the recreate verb is used. In other words, this is for debugging, not goofing around. Verbs available in debug verbs.
- Some atmos code standardization
- Decreased the pressure resistance of most items by a factor of 10, meaning pressure will finally actually move items around!
I also attempted to speed up air movement, but it caused runtimes and everything moved in checkered patterns and I got scared so I didn't include it in this commit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5554 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-15 07:12:32 +00: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
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
giacomand@gmail.com
458fddbea5
- Tweaks to spiders to be less robust.
...
- Made goats/cows not give infinite milk but instead slowly generate milk in their udder for collecting.
- Lowered speak chance for chickens and added a limit for how many chickens can be bred.
- Lowered the chances of an egg to be a chicken hatching egg.
- If you put an egg in your pocket it won't be a chicken hatching egg anymore.
- Chickens won't spawn inside you anymore.
- Added some abstract classes to the list of things that shouldn't spawn with slime cores.
- Increased the time between events.
- Added a spawn spiders button for admins.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5535 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-12 23:07:51 +00:00
Chinsky
f22749df04
Merge branch 'adminstuff'
...
Conflicts:
code/modules/admin/admin_verbs.dm
2013-01-12 23:48:03 +04:00
Chinsky
dc2f77ddd0
Merge branch 'cult'
2013-01-12 22:30:56 +04:00
giacomand@gmail.com
a56e922053
Committing for Cael_Aislinn:
...
= Giant Spiders =
- Nurses spin webs which impede progress, bundle items and mobs up in cocoons, lay eggs to create spiderlings
- Nurses are slow and weak, but their bite has a chance to paralyse the victim
- Spiderlings skitter about and eventually grow into giant spiders.
- Spiderlings will ventcrawl, so they can spread over the station pretty fast.
- Hunters are fast, have decent health and the most effective poison
- Guards are medium speed but the health and direct damage
- The poison of hunters and guards can cause hallucinations if they bite you
= Farm animals =
- Cows can be milked or butchered for a large supply of meat. Sadists can also tip them over (with intent_help).
- Goats can also be milked, but have a nasty temperament.
- Chicks grow up to be chickens, who lay eggs and continue the cycle. But where did it start? (they're very noisy).
- All three are orderable via QM.
My changes:
- Added a spider infestation event.
- Optimized code with spiders and simple_animals.
- Made a /hostile/retaliate type which will only fight back when hurt. Based on Cael's code.
- Added some farm animals on the map.
- Changed events, added a setup() proc which can let you setup variables or the event. Made the event only kill itself when it has called, announce(), start() and end().
- Brainrot will only need alkysine as a cure.
- Communication blackout will always be silent.
- Changed some admin buttons to use the new event system.
- Added a forceEvent proc which you can use when you enable debug verbs.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5525 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-12 16:44:06 +00:00
baloh.matevz@gmail.com
fa84ba9611
- Added a small bit to the SQL statement so I can update the database structure later on, without it breaking the ban system until it updates.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5517 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-11 13:54:11 +00: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
Chinsky
e55e8fc3a3
Added verb for admins to create additional job slot.
2013-01-11 04:22:05 +04: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