Commit Graph

4077 Commits

Author SHA1 Message Date
elly1989@rocketmail.com
eb10f04ea3 obj/hud is now datum/hud. There was no need for it to be an object.
Moved some of the static overlays such as the dither effects, druggy effect and blurry-eyes into datum/global_hud. Meaning that only one object is instanced per server rather than per mob. It reduces on code.
Commented out a green and red overlay which aren't used, which were being instanced for every mob.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4767 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-28 23:02:11 +00:00
Erthilo
c5f126430a Merge pull request #1718 from ThatOneGuy42/master
Fixes an indention issue
2012-09-28 11:55:55 -07:00
elly1989@rocketmail.com
b903680fbd Changed client/verb/a_intent_change() to mob/verb/a_intent_change()
Replaced usr references with mob
This means it can be called as a proc for any mob to use that code. Updated the click-procs to use this as they were using slightly different code.
Fixed an issue with AIs using the intent hotkeys
Added more sanity checks to it.
Insert key uses the same code as other hotkeys.
Commented out some unused hud-code from when we had separate intent buttons.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4766 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-28 06:45:57 +00:00
elly1989@rocketmail.com
01882fec26 Resolves issue 961 - invisibility is set in the define not in New for ghosts
Replaces usr with mob. Using usr means invisimin can't be used as a proc


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4765 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-28 03:56:51 +00:00
quartz235@gmail.com
a6e7c085ef Revert's cib's BS12 merge by XSI's orders
- Tested with various damtypes/locations/mobs but if i'm a dumbass and overlooked a problem feel free to punch me and revert this

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4762 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-27 02:14:21 +00:00
giacomand@gmail.com
4ef1ae9634 -Fixed changelings being unable to use their powers. (Sorry about that)
-Fixed runtimes with the camera tracking.

-Fixed an issue where alien larva couldn't heal oxygen loss damage.
-Fixed a runtime with cameranet chunks.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4761 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-26 23:36:15 +00:00
rockdtben@gmail.com
01a93bb78e Fixes issue 960
- Keeps simple animals simple.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4760 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-26 22:15:27 +00:00
elly1989@rocketmail.com
4edc10c0a1 Fixed an issue where ticker.mode could be set to null, triggering a restart, where it'd be set to null again...and so on.
Added a activate held item hotkey
Added intent hotkeys to 1 2 3 and 4 keys.
hotkeys-help for details.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4759 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-26 16:27:47 +00:00
Cael_Aislinn
a7bd4eeb42 some minor tweaks to character preview to be in line with tg
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-26 20:52:51 +10:00
Cael_Aislinn
0fbf610ffb more merge fixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-26 20:31:13 +10:00
Cael_Aislinn
640ce4fd5c WIP mergefixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-26 20:10:58 +10:00
Cael_Aislinn
7ab7b989f2 added searif's new skrell hairstyles (missing lying icon states)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-26 19:01:47 +10:00
Cael_Aislinn
b618eeef82 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
Conflicts:
	code/controllers/configuration.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/factions.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/verbs/ooc.dm
	code/game/verbs/who.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/login.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/paperwork/paper.dm
	config/config.txt
	html/changelog.html
	icons/mob/human.dmi
	icons/mob/human_face.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-26 18:49:18 +10:00
Cael_Aislinn
a668a45f8b fix for alien whitelisting
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-26 18:08:34 +10:00
elly1989@rocketmail.com
cc2c4de49b Merged var/muted_ic; var/muted_ooc; var/muted_deadchat; var/muted_pray; var/muted_adminhelp into var/muted as bitflags
Added a config option config.automute_on It toggles automuting.
Admins cannot be muted.
Made the proc/cmd_admin_mute code shorter.
Automuting defaults to off

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4758 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-25 21:23:02 +00:00
elly1989@rocketmail.com
42d138d0a0 Deleting more obsolete code.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4756 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-25 14:22:18 +00:00
elly1989@rocketmail.com
349317a9bf Removes client/var/team. It was unused.
Tidies up a few loose ends with the obj/admins -> datum/admins changes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4755 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-25 14:14:13 +00:00
elly1989@rocketmail.com
1942f3710e Deleting the old admin holder stuff
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4754 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-25 13:15:37 +00:00
elly1989@rocketmail.com
9813d2bbec var/fakekey; var/ooccolor; var/sound_adminhelp moved from /client to /datum/admins. These settings will now persist through a round even through logouts.
var/stealth merged into var/fakekey as it was superfluous.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4753 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-25 13:09:43 +00:00
Mloc
5ab12f802a Merge pull request #1726 from Erthilo/master
Post Merge Fixes and Tweaks.
2012-09-24 13:06:53 -07:00
Erthilo
a88c318051 Attack logging, better intent switcher HUD, alien species fixes, misc admin commands, moderator commands. 2012-09-24 17:56:49 +01:00
Jim "Apples"
fb3f9f0522 Merge pull request #1720 from SparklySheep/patch-4
Small custom item fix for my comb.
2012-09-24 07:16:35 -07:00
petethegoat@gmail.com
7023909912 Changed toggle midis to a client verb.
Fixed it even harder this time. Worked fine in testing, please report any issues to me straight away.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4750 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-24 12:24:33 +00:00
elly1989@rocketmail.com
f8da06db13 Re-added the default-vote config option for voting. For every client connected more than the total votes, it will add 1 to the default vote option (No restart or the current game-mode).
/obj/admins is now /datum/admins because that's what datums are for you silly people
Moved var/datum/marked_datum from /obj/ to /datum/admins
admin datums are persistent throughout the round. They are stored in the var/list/admins rather than the ranks. This is so admin preferences may be moved into the datum to have them persist even after Login/Logout/Disconnects.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4749 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-24 11:40:41 +00:00
elly1989@rocketmail.com
9e182f0e39 Fixes a possible problem where admins could be kicked if ghostize failed whilst they tried to Adminghostize
Fixes Issue 959 - the holder's state was not being set properly. It is now all handled at login. Verbs only update if rank or state have changed. You can bypass this simply by setting holder.state = null  before calling update_admins()
Moved obj/admins stuff into holder.dm so the core stuff is together, pending some possible work on admin-ranks.
Admins can no-longer adminghost whilst in the lobby.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4746 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-24 06:06:25 +00:00
petethegoat@gmail.com
508ca6a7d3 Fixes an issue with severed heads displaying an error message.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4745 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-24 01:23:23 +00:00
petethegoat@gmail.com
9a376f2ea0 Fix for the char setup overlays.
As the mouth overlay is only used for lipstick now, we can ignore it completely for the preview.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4744 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-23 22:27:48 +00:00
Erthilo
5c6038b726 Compile fixes. 2012-09-23 21:54:36 +01:00
Erthilo
c00b0ae84d Added attack logging, some moderator groundwork, fixed alien species and save files. 2012-09-23 21:49:25 +01:00
daniel.cf.hultgren@gmail.com
7b6e58969f I'm back with the greatest feature additions ever, as before!
* You can now dispense sort junctions from the disposal dispenser.
* Sort junctions can now properly be unwelded.
* You can now change a sort junctions filter using a package tagger (examining a sort junction shows its current filter).
This also means that you can now construct a disposal and package system entirely from scratch!

* Updated the package tagger with a slightly updated interface, and more user feedback.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4742 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-23 18:53:31 +00:00
giacomand@gmail.com
b37ad5df02 -Changelings will start with the free powers. Meaning they don't have to buy it everytime.
-Buffed paralyse sting to 20 weaken. I made this change due to the new choking, as it was nearly impossible for the changeling to have enough time to sting their victim and get them into the killing grab, while before it would be extremely easy.

-When editing someone's memory and making them antags, it will display a warning message to admins to notify them of your action.

-Fixed EMP'ed lockers not updating their icons when they're unlocked.
-Lowered the cost of the agent card to 2 Telecrystals.
-When vent crawling, welded vents won't show up in the list.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4740 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-23 15:35:07 +00:00
petethegoat@gmail.com
c016c10bfa Fixes issue 955. (Signalers don't update bomb overlays)
Fixes issue 957. (Sexy mime costume causes incorrectly coloured cleavage)

Adds lipstick~
There are four colours to choose from, and they can be found in contraband crates. You can wipe off lipstick with paper.

Adds some feedback for when the invisimin verb is used.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4739 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-23 15:31:01 +00:00
Cael_Aislinn
cac787bc77 anomaly lab is finished (with a slight remap). some minor remaining todos (sprites), TODO: ?
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-23 23:54:26 +10:00
giacomand@gmail.com
73aebb51a7 -Small tweak to /atom/DblClick. The dummy will be garbage collected instead, hopefully this will help performance. I'm concerned that somehow other code will reference the Dummy, stopping it from being garbage collected. I think that the small occurrences that this could will not be game breaking or affect anything.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4737 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-23 05:17:54 +00:00
Cael_Aislinn
283ae84dad various mergefixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-22 21:37:42 +10:00
Cael_Aislinn
e645d78f11 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/datums/organs/organ_internal.dm
	code/datums/vote.dm
	code/defines/atom.dm
	code/defines/procs/gamehelpers.dm
	code/defines/turf.dm
	code/game/algorithm.dm
	code/game/cellautomata.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/wizard/rightandwrong.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/computer/ai_core.dm
	code/game/machinery/computer/law.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/teleporter.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/structures/electricchair.dm
	code/game/turfs/turf.dm
	code/game/vote.dm
	code/hub.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client defines.dm
	code/modules/food/food.dm
	code/modules/food/meat.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/hud.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/login.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/new_player/login.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/photocopier.dm
	code/setup.dm
	icons/effects/genetics.dmi
	interface/interface.dm
	interface/skin.dmf
	maps/RandomZLevels/fileList.txt

various misc mergefixes and todos

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-22 21:29:04 +10:00
Cael_Aislinn
1bf5b97b2e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	code/modules/customitems/item_spawning.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-22 18:31:52 +10:00
Kortgstation@gmail.com
37cd7537a5 NPC clowns should actually die in space now.
Mechas now protect from space again (credit to Aranclanos, though I totally helped with this)

Mecha occupants now finally get some feedback/notification when they toggle their airtank lights(credit to Aranclanos)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4736 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-21 21:34:05 +00:00
SparklySheep
11d384bede Small custom item fix for my comb. 2012-09-20 15:24:47 -05:00
giacomand@gmail.com
7fc77b0bc5 -Small improvements to atmos. Most notable is combining two loops into one during initialization and commenting out a loop with no nested code.
-Set chunk/update to be a background proc.
-Made it so the Eye's loc won't be set to null when moving out of the map.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4735 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-20 14:24:50 +00:00
CIB123
237827d985 Fix issue 930: The standard module now has working eye-lights.
This is based on a patch created by Aranclanos, http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=10123

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4732 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-19 22:30:07 +00:00
CIB123
5979115942 More fixes for the organ system.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4731 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-19 21:47:36 +00:00
CIB123
fad4dcbada Merge branch 'cib' of github.com:CIB/tgstation13 into cib
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4729 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-19 18:54:49 +00:00
CIB123
a7cba9170d Fixed a problem with organ name display.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4728 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-19 18:04:35 +00:00
Kortgstation@gmail.com
3b9e914f32 Clown and carp are faster now so they can actually catch their targets.
Camera lists don't include mobs on away missions.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4727 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-19 05:55:08 +00:00
CIB123
5e4535a58e Fix Issue 886: Appearance should now update after taking ryetalyn.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4723 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-18 22:31:20 +00:00
CIB123
b555f5a0f0 Fixes a few issues with the organ system.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4722 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-18 21:34:05 +00:00
CIB123
d6dfd49a75 Ported parts of the BS12 organ system.
This includes:
- Individual wounds
- Dismemberment
- Bone breaking

It also adds configuration values to config/game_options.txt to control the point at which bones break and limbs are cut off.

Does not include surgery or bleeding yet.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4720 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-18 21:32:39 +00:00
giacomand@gmail.com
0fbfa48217 -Added more info for admin messages in these areas:
Chem smoke will say what reagents are in the chem_smoke.
Added a more_info ? to the last fingerprint that touched the grenade.
Added a more_info ? to bomb's last fingerprint and the attacher.
Admins get a warning message when someone summons guns.
Added a jump link to bomb's activation location.
Added a jump link to chem smoke's activation location, it will also show you the area's name.

-NarSie won't follow mobs in another Z level.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4719 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-18 09:49:51 +00:00
Kortgstation@gmail.com
84308d4042 Split the gateway/center into two objects, stationcenter and stationaway. The gates actually search for and detect eachother, and warp to eachother (suck it Pete)
The away gate doesn't require power to make away mission mapping possible in unpowered areas like caves, the station gate requires less power than it did (for the time being, it'd be nice if people could actually use the gate. Makes no sense to make new content so hard to use. If it becomes a problem, I can up the power requirement again).

Added a "calibrated" var to the away gate. If it's uncalibrated, you'll warp to the destination landmarks. Hitting the gate with a multitool with calibrate it, and any more warping to the gate will be on target.

It defaults to calibrated, so remember to set it to 0 if you want people to appear somehwere other than at the gate.

Updated Cheridans map with the new gate type (and made it uncalibrated)

Updated the example map to use the new gate type

Updated the station to use the new gate type

Changed the gateway description to reflect it's unknown origin

To do: Make gates able to block sending from the other gate (so you can exile people), make damaging gates so they can't send/recieve (and still do the other) possible. Give the station gateway unique sprites (for Nanotrasens own prototype gate, with appropriate description)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4718 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-18 05:59:36 +00:00