Commit Graph

9355 Commits

Author SHA1 Message Date
Erthilo
a88c318051 Attack logging, better intent switcher HUD, alien species fixes, misc admin commands, moderator commands. 2012-09-24 17:56:49 +01:00
Erthilo
1ed6478d65 Config changes to reduce run speed and enable dismemberment. 2012-09-24 17:55:58 +01:00
Erthilo
5c6038b726 Compile fixes. 2012-09-23 21:54:36 +01:00
Erthilo
040b145f11 Removed ZAS debug. 2012-09-23 21:49:40 +01:00
Erthilo
c00b0ae84d Added attack logging, some moderator groundwork, fixed alien species and save files. 2012-09-23 21:49:25 +01:00
Erthilo
2e622eae93 Merge pull request #1671 from caelaislinn/bs12_with_tgport
Merge of BS12/master with tgstation13 rev4763 (22/09/2012 8am GMT)
2012-09-23 10:38:30 -07:00
Cael_Aislinn
5a80f12243 increased move delay
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-23 23:54:50 +10: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
Cael_Aislinn
9874d96f74 began adding xenoarch to tgstation209 (WIP), tgstation2.0.9.1 is the edited version, tgstation2.0.9 is the unedited version
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-23 00:27:45 +10:00
Cael_Aislinn
10721fadbc fix for internals spawning empty
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-22 22:46:02 +10:00
Cael_Aislinn
a7cb8f56d6 updated changelog
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-22 21:38:14 +10: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
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
Superxpdude@gmail.com
ea1c1a5a0d Fixed the lights on the exterior of the mining station not being powered.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4734 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-20 02:01:54 +00:00
johnsonmt88@gmail.com
bf323d3eca Updated my away mission map:
- The safe code is now randomly generated at round start
- The projectile guns now spawn with very little, or no ammunition.
- The energy guns (except the one in the captain's safe) now fire practice laser shots.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4733 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-20 00:28:02 +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
d6206e172d Merge branch 'cib' of github.com:CIB/tgstation13 into cib
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4730 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-19 18:54:55 +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
johnsonmt88@gmail.com
37b1c2f381 Unticked the away mission map files in the previous commit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4726 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-19 02:30:42 +00:00
johnsonmt88@gmail.com
a8c1116d45 Nodrak's away mission map!
It's a small research station that has been rammed by a syndicate shuttle.
Note that power slowly drains from the map, the SMES does not appear to be outputting any power. Any additional code is contained in stationCollision.dm

I've removed the line about z-level transitions from fileList.txt as those got removed from awaymission zlevels.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4725 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-19 02:24:08 +00:00
CIB123
4b98c9bcf5 Merge branch 'cib' of github.com:CIB/tgstation13 into cib
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4724 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-18 23:09:26 +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
35a3b0c152 Added config options for toggling limbs breaking and bones breaking.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4721 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-18 21:33:54 +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
johnsonmt88@gmail.com
be04c81a27 Captains no longer spawns with a cigar in their mouth, instead it spawns on the desk where the captain spawns.
CEs no longer spawns with a cigarette in their mouth. I did not add a cigarette to their desk because there is already a cigarette pack that spawns there.

Moved some stuff in singularity/New() into its own proc that singularity/New() calls. This is so that I can override it and prevent runtimes with an away mission.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4717 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-18 01:36:40 +00:00
petethegoat@gmail.com
5e1ea2c70e Committing vitally important lipstick sprites. Four shades to choose from!
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4716 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-17 22:50:09 +00:00
Kortgstation@gmail.com
4199496a34 Clowns have better reaction time in response to being attacked or witnessing their fellows in combat.
Changed their default intent to harm and made it possible for them to collide with/block other mobs (two hostile clowns chasing me got stuck swapping places forever trying to get at me in testing).

Their attacks now have a horn sound.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4715 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-17 22:43:25 +00:00
d_h2005@yahoo.com
3c589fc824 -Replaces all metroid sprites with rorobeast sprites.
-Removes jars which were redundant and used nowhere else but metroid jelly stuff. Rorojelly now comes in a beaker.

I've replaced most of the important names and messages where applicable. Going through and replacing all instances of the word 'metroid' with 'roro' in the code is a project in itself.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4714 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-17 19:39:11 +00:00
elly1989@rocketmail.com
6e2084a173 Derp. Minor typo in a string. Credits to Calas
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4713 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-17 18:27:36 +00:00
petethegoat@gmail.com
913d884e6c Updated some chemistry reagents- went over all of them which involve body temperature.
Fixes issue 916. (disposal chute spam)
Fixes issue 877. (cell chargers draw absurd amounts of power) The fix for this one is pretty crude, but luckily it's not like we have a beautifully balanced power system to worry about.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4712 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-17 14:47:48 +00:00
Kortgstation@gmail.com
ab6f97bc75 Work on NPC clowns for the clown planet away mission.
They start peaceful, but attacking them causes them to attack you like a carp.

Attacking a clown will also make all other clowns that can see the attack hostile.

If a clown sees a clown attacking someone, they'll join in the attack

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4711 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-17 06:20:37 +00:00
elly1989@rocketmail.com
de35030dd6 Added an invisimin verb. It toggles your mob's invisibility between ghost-like invis and it's initial state. It is bound to the F8 key.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4710 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-17 03:25:37 +00:00
elly1989@rocketmail.com
9bb09aad58 Admins can adminghost via the F5 key.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4709 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-17 02:47:42 +00:00
elly1989@rocketmail.com
9265255ab5 Fixes an issue where areas were set with luminosity = 1. Not sure why the hell I done that and why the hell I never noticed it. Thanks Kor.
Once again, Only crates may be sold on the supply shuttle.
Changed adminverb updates to be called by Login if holder.state changes. This is so we don't have to mess around with it elsewhere and we don't have to call it as often.
Added some missing verbs to the clearadminverbs proc
Fixed a icon reference not using the fullpath (Goddamn stop doing that)
Going catatonic makes you fall down
All mobs with the resting variable can now unrest (god damn what were you doing).
"Lay down / Get up" was renamed to "Rest".
Rest now uses src rather than usr (again, wtf)
Added some ugly fatty fat hacky code to make admin-ghosted mobs appear braindead rather than catatonic
Admin-ghosting (set-observe and set-play) merged into one verb named "Aghost" (short for admin ghost, same convention as asay)



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4708 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-17 02:27:12 +00:00
johnsonmt88@gmail.com
9a3ccb6d47 Re-added most of the one-click antag buttons back that the tensioner used to have.
The Admin tab now has a 'create antagonist' button that opens a panel with a list of options.

Make traitor, changeling, revolution, cult, malf AI and Wizard should all work just fine.

Make Nuke ops, space ninja, aliens and deathsquad all need some work.

Hopefully this at least covers the majority of what admins "need" this panel for, at least until the rest of the buttons can be fixed.

Please report any bugs found with this to the issue tracker. I'll get to them as soon as I can.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4707 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-17 01:44:36 +00:00
johnsonmt88@gmail.com
a49a37686f Dead sprite for parrots.
Both Pewter and I completely forgot about this until I was already adding them. Thanks again for the great sprite Pewter!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4706 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-17 01:25:49 +00:00
petethegoat@gmail.com
da9169d75d Work on photocopiers, and other paperwork stuff.
You can now photocopy photos! Hurray, the entire crew can have pictures of Ian to keep in their wallets.
Filing cabinets now accept photos, and update properly.

Also committing a new (unused) vending machine sprite from old BS12 code.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4705 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-16 20:10:28 +00:00
johnsonmt88@gmail.com
caa3f8055d Parrots:
- Parrots now have absolutely gorgeous sprites thanks to Pewtershmitz
- Removed a few "world <<"s that I missed
- Fixed parrots picking up their own headset (and duplicating it)
- Fixed parrots not properly running away from carbon mobs

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4704 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-16 18:34:39 +00:00
petethegoat@gmail.com
2717517f17 Fixes issue 854. I have very little confidence in the longevity of my fix, so if any issues with the nuke shuttle doors arise in the future, please inform me!
Added a little bar for nuke ops to relax in, following a job well done.

Updated pod control computers to only show time controls if a mass driver is attached. Doors don't need to be on a timer.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4703 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-16 14:32:23 +00:00
petethegoat@gmail.com
5754bc0ef3 As usual, here's a fix for retardation in my last commit. :|
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4702 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-16 12:49:56 +00:00
petethegoat@gmail.com
99745c2295 Fixes issue 929.
Changed nuke ops to use buffed C20Rs again, hurray!
Cleaned up the nuke shuttle code in preparation for fixing issue 854, and renamed var/derp.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4701 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-16 12:42:58 +00:00