Commit Graph

4373 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
c00b0ae84d Added attack logging, some moderator groundwork, fixed alien species and save files. 2012-09-23 21:49:25 +01: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
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
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
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
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
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
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
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
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
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
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
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
giacomand@gmail.com
33c738de3e -Fixed an issue where you would compare your name with yourself to see if it was available.
-Fixed an issue with the Upgrade Camera malf module.
-Fixed an issue with HTML codes in whisper.
-Ghost ears and eyes default to 0.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4700 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-16 05:43:27 +00:00
Kortgstation@gmail.com
d85e161c4d Fixed checking for assassination targets. It checked for them on 8 or higher, the away mission Z is 7.
A number of computers no longer work on Z7 (away mission).

-AI upload
-Security cameras
-Crew monitoring computer
-Comms console
-Robotics console
-Security records

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4699 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-16 04:36:58 +00:00
petethegoat@gmail.com
bd12633922 Fixes issue 921.
Addresses part of issue 828.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4697 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-16 01:48:57 +00:00
petethegoat@gmail.com
382012f1f0 Removed those ugly hazard doors!
Fixes issue 922.

Includes single tank bombs in the .dme for live testing.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4696 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-16 00:39:18 +00:00
petethegoat@gmail.com
5f62f4c864 Fixes issue 927
my face

(the fix is entirely in door.dm)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4695 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-16 00:01:19 +00:00
petethegoat@gmail.com
5b33027e69 Fixes issue 865.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4694 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-15 23:37:20 +00:00
Kortgstation@gmail.com
0bbb591b3e You can no longer transition off the away mission Z level (so people don't randomly end up at telecomms after running off the edge of a tundra or something)
Alien weeds now die in one hit to a welding tool, and 6 from a extinguisher. You can plant like a billion of them for no cost, they shouldn't take four hits of a welding tool to clear.

Added the black crab sprites for HG

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4693 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-15 22:40:20 +00:00
petethegoat@gmail.com
ce9f054af3 Fix for me being retarded (this seems to happen a lot lately huh)
+ start of surgery work, including my heart sprites <3

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4692 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-15 22:10:30 +00:00
petethegoat@gmail.com
2039d276d2 Standardisation for tape recorders.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4691 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-15 18:13:37 +00:00
petethegoat@gmail.com
a7a42b868f Fixing cigs_lighters.dm
Fixes issue 903.
Fixes issue 871.
Fixes issue 855.

Fixes a ton of bullshit in cig code! You can throw cigarettes into plasma to ignite it again, and such.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4690 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-15 17:54:53 +00:00
giacomand@gmail.com
a23da872ac -Added a new secret admin button.
It'll turn the floor into lava and deal damage to people. Admins can change the duration and the damage it deals.

http://i.imgur.com/2TA3F.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4684 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-13 07:20:13 +00:00
d_h2005@yahoo.com
54c4e52598 Commiting my away mission map. Explore the interior of a dark and damaged black market ship.
A minor note: I encountered some issues with the APCs not charging from the SMES cells on the ship. If this happens, it can be fixed with the debug verb Remake Powernets.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4683 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-13 03:23:14 +00:00
giacomand@gmail.com
1d72e3c4e9 -Fixed issue 913
You'll have to write the name on the paper itself now.

-Fixed issue 912
-Fixed issue 909
Also, Cyborgs without names are called "Default Cyborgs". 

-Fixed issue 908

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4680 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-12 08:57:30 +00:00
giacomand@gmail.com
9b78786611 -The AI can now select a name after being AIed by someone placing their brain into the core. Fixed Issue 857
-You can't show messages to dead/clientless AIs by putting a page of paper up to the camera.

-Ghost following will get a list of mobs from getmobs, it'll sort it by mob type and by name.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4679 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-12 02:53:50 +00:00
petethegoat@gmail.com
2d9facde18 Removed maintenance access from assistant. Updated the primary tool storage doors to be all access.dm
Reasoning: http://i.imgur.com/Wa9xl.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4675 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-10 13:41:44 +00:00
giacomand@gmail.com
e1bdd57bf2 -Fixed holopads not letting you holo_talk when you weren't on the holopad.
-AIs can now double click on living mobs (/mob/living) to instantly start tracking them.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4673 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-10 09:45:07 +00:00
Kortgstation@gmail.com
ed3f216514 Cult swords are force 30 now, and don't fit in bags or on belts. Use the damn robes they come with if you want to use em.
Artificers no longer have delay on spells, but can't create R-Walls

Carp attack damage is now 15 flat, having a chance to deal only 5 makes them far too weak.

Bears now actually have an attack value higher than zero, so players keyed into the bear can attack.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4672 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-10 01:31:54 +00:00
johnsonmt88@gmail.com
7dcf0dc701 Fixed mobs who tried to walk whilst inside an unlocked, wrapped locker would disappear into nullspace. Fixes issue 905.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4671 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-10 00:42:00 +00:00
giacomand@gmail.com
384b2717b0 -Added a "landmarks_list"; the game will now check for landmarks in the list instead of the world.
-Did some optimizing to AI freelook.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4670 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-09 22:27:06 +00:00
petethegoat@gmail.com
76982301be Noticeboard updates. Mostly just tidying up, but noticeboards now grab paper on the same tile as them on round start. This is mainly so away missions can have things pinned to noticeboards.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4665 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-09 12:01:41 +00:00
petethegoat@gmail.com
8a7e4e4ed5 A little bit more away mission work. It should technically be playable.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4663 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-09 01:29:05 +00:00
johnsonmt88@gmail.com
c7947ef236 File restructuring: ohgodihopenothingbroke edition.
All /world/ stuff that I've found is now in code/world.dm instead of being scattered throughout the code in 6-7 files.

*****IMPORTANT*****
This means that hub.dm is now part of world.dm. Server hosts using the hub will likely have to redo the hub/password variables!

Again, that stuff is now located in code/world.dm
*******************

The tester list has been removed as it is not in use.

/code/defines
- Moved atom.dm code into /code/game/atom.dm and atom_movable.dm
- Moved hub.dm code into /code/world.dm
- Moved the /defines/tanning into objects/item/sheets/leather.dm
- Moved /defines/area/ into game/area/
- Moved turf.dm code into the code/game/turfs folder and divided it up into meaningful places

A lot of the files in /code/game were placed in new areas since they really didn't have a reason to be there.
- algorithm.dm: 
- - The world stuff is in world.dm. 
- - countJob() and AutoUpdateTK() were removed entirely (unused).
- - AutoUpdateAI() is now in /mob/living/silicon/ai.dm

- atom_procs.dm was split into atom.dm and atom_movable.dm

- cellautomata.dm
- - World stuff was moved into world.dm
- - Atom stuff was moved into atom.dm and atom_movable.dm
- - Atom verbs were moved into code/game/verbs/atom_verbs.dm

- chemistry.dm
- - Beaker box code was moved into storage/misc.dm
- - The trash can and 'alechemy' paper were removed. (unused)

- Landmarks.dm was moved into /objects/effects/landmarks.dm

- prisonshuttle.dm, specops_shuttle.dm, syndicate_shuttle.dm and syndicate_specops_shuttle.dm have been moved into game/machinery/computer/

- status.dm and topic.dm code were moved into world.dm

- step_triggers.dm are now in objects/effects/step_triggers.dm

- throwing.dm was split into appropriate files (carbon mob code, atom_movable.dm, ect)

- vote.dm is now in code/datums

/code/game/asteroid was split up.
- turf.dm was moved into game/turfs/simulated/asteroid.dm
- artifacts were split up
- - Wish granter is now in game/machinery
- - The stealth box is gone (unused)
- - The list of 'space suprises' was moved into astroid.dm
- asteroid.dm, being the only file left, was moved into /code/game


and finally...
modules/mob/organs files are now in code/datums/organs

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4659 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-08 22:11:02 +00:00
Cael_Aislinn
69ec1e3eca added random barsigns. will add them to the map when we get closer to merging
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-09 00:39:43 +10:00
Cael Aislinn
daeb09c4c2 Merge pull request #7 from ThatOneGuy42/bs12_with_tgport
-Should- add Crew Transfer Shuttle.
2012-09-08 07:27:52 -07:00
elly1989@rocketmail.com
278aacd80a Changelings absorbed by other changelings can no longer rejuvenate back to life. This means changelings can no longer absorb eachother and rejuvenate to share genomes and absorbedcounts.
Fixed the transform to initial appearance adminverb.  I'm assuming it got broken when DNA was changed.

Made the cloaked-xeno sprite slightly more visible.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4656 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-08 08:16:37 +00:00
giacomand@gmail.com
55937eced9 -Fixed laws from producing HTML numbers.
-Made it so that any law module, which requires user input, refuse the install if the input is null. By then making all the default laws/name of these modules null, the user will get a message if they try to upload a law without modifying it first.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4655 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-08 07:46:34 +00:00
elly1989@rocketmail.com
3f80d538a5 Falsewalls and FalseRwalls are now anchored. They now become immediately dense when closing rather than having a few second delay, so you can't run through them when they look closed.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4651 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-08 05:16:43 +00:00
elly1989@rocketmail.com
990f995c30 Voting now defaults to off. This is due to an exploit in the voting system which nobody is interested in helping to fix. I'll have to do it.
Resolves issue 898 - airlocks now update nearby airgroups when forced open with a crowbar/fireaxe.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4650 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-08 04:24:02 +00:00
Cael_Aislinn
f7fcfa2a6f Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4649)
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/machinery/computer/law.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html
	icons/effects/effects.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-08 14:22:44 +10:00
giacomand@gmail.com
75cf50fa17 -Reverted the maintenance cameras.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4645 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-07 16:49:34 +00:00
petethegoat@gmail.com
6f27b40a96 Single tank bombs.
There's a couple of known issues, and they've not been tested, so they're unticked for now.

This includes some adjustments and fixes for other assembly stuff, and it also renames most tanks.

Shout at me if this breaks anything.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4644 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-07 13:39:13 +00:00
elly1989@rocketmail.com
aeaf790882 Removed a spawn() from rad_collector/New()
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4643 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-07 09:48:57 +00:00