Commit Graph

5784 Commits

Author SHA1 Message Date
Albert Iordache
a6f89fefee Merge pull request #398 from caelaislinn/master
new custom items
2012-02-10 14:32:38 -08:00
Tastyfish
bc2817a0a4 rejuvinate resets body temp, stabilize atmos restabilizes a chosen area's atmos 2012-02-10 17:15:50 -05:00
CaelAislinn
0edd231592 added new custom items
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-11 07:24:50 +10:00
baloh.matevz
52aa3bcc19 - toggle-hear-radio and toggle-hear-deadcast now properly say whether you will or won't hear the two communication types when toggling them.
- added a de-admin-self verb for admins. This exists so admins can play games without having to deal with 2nd accounts and such. It removes all the verbs and deletes the 'holder' object, so admins lose all their verbs, asay, adminhelp/prayer hearing, everything. They are exactly the same as normal players. To return to being an admin someone has to promote you back. The effects of de-admin-self are only for the current round.

Coders, when adding new admin verbs, don't forget to also add their removal into /client/proc/clear_admin_verbs()

Added jumptocoord, everyone_random and cmd_switch_radio to the proc, so hiding admin verbs works more properly.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3080 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-10 20:36:58 +00:00
Albert Iordache
a28ade459a Small fix. 2012-02-10 21:09:34 +02:00
Albert Iordache
1f1ea35a75 Added a way to skip the computer ID check for bans, and cleaned up the code a bit 2012-02-10 21:01:20 +02:00
Tastyfish
bd6fbb5fe8 fix to sky's reagent effects changes 2012-02-10 00:07:29 -05:00
SkyMarshal
1d29574bc3 Part 2 of the WIP chemistry stuff
Map update with secure doors!
2012-02-09 21:50:50 -07:00
SkyMarshal
90d47bccf9 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-09 16:29:31 -07:00
SkyMarshal
48453a3592 WIP work in making welding fuel not retarded
Chem grenades are now awesome again.
2012-02-09 16:29:06 -07:00
CIB
03aea121d8 Merge pull request #384 from caelaislinn/master
department lockers, other stuff
2012-02-09 15:23:55 -08:00
CaelAislinn
03f970de65 Merge branch 'master' of git://github.com/Baystation12/Baystation12
Conflicts:
	code/game/objects/closets/secure/engineering.dm
	maps/tgstation.2.0.8.dmm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-10 09:11:08 +10:00
SkyMarshal
90affc2bfc Merge pull request #392 from CIB/master
Fixes to shock-crit and co
2012-02-09 14:45:47 -08:00
nemo
f0e221a1ab Increased the speed at which you lose damage in shock-crit greatly, and the speed at which you heal in non-crit slightly. 2012-02-09 23:34:19 +01:00
baloh.matevz
c12a1b4206 Added the caution code, sprited by magicbones, not present anywhere on the map
http://nanotrasen.com/phpBB3/viewtopic.php?f=10&t=4548&start=50#p37266

Added a power switch (/obj/structure/powerswitch), which is used to split or connect two cables.

The way it works is simple. It connects the powernets by adding cable on the floor it's on and removing it when it's turned off.

In-file description:
//This is a power switch. When turned on it looks at the cables around the tile that it's on and notes which cables are trying to connect to it.
//After it knows this it creates the number of cables from the center to each of the cables attempting to conenct. These cables cannot be removed
//with wirecutters. When the switch is turned off it removes all the cables on the tile it's on.
//The switch uses a 5s delay to prevent powernet change spamming.

Screenshot:
http://www.kamletos.si/power%20switch.PNG

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3072 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-09 21:11:20 +00:00
baloh.matevz@gmail.com
0d7a944e50 Added a new variable to all mobs: var/original_name
This variable is set ONLY when you spawn. It is also only used for deadchat communication. This variable is not to be changed after mob creation.

the new deadchat format is:
http://www.kamletos.si/deadchat222.png

line before suicide = spoke alive just before I suicided (name = unknown; real_name = "Duncan Sagan"; original_name = "Duncan Sagan")
the 2nd to last line is me speaking from the human body (name = "Unknown"; real_name = "Duncan Sagan"; original_name = "Duncan Sagan")
the last line is me speaking after ghosting (name = "Duncan Sagan"; real_name = "Unknown"; original_name = "Duncan Sagan")

So when alive everything is as before,

When you speak as a dead human you get 
DEAD: Original_name says, "message"

When you speak as a ghost you get
DEAD: Original_name (as real_name) says, "message"
(the as real_name is skipped if the two are the same)

If there is some overlooked situation where new mobs are created and original names don't copy over, then real_name is used in all forms of deadcast communication.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3066 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-09 02:52:04 +00:00
petethegoat@gmail.com
e6f31fae1a Amended feedback vars from last commit.
New vars are as follows.

cyborg_frames_built
cyborg_birth
cyborg_mmis_filled
cyborg_ais_created

cyborg_standard
cyborg_service
cyborg_miner
cyborg_medical
cyborg_security
cyborg_engineering
cyborg_janitor

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3065 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-09 02:38:15 +00:00
petethegoat@gmail.com
24e2aedab8 Added stat tracking for cyborg frames built, cyborgs created, MMIs filled, AIs created, and cyborg modules chosen.
cyborg_frames_built
cyborgs_created
mmis_filled
ais_created

standard_cyborgs
service_cyborgs
miner_cyborgs
medical_cyborgs
security_cyborgs
engineering_cyborgs
janitor_cyborgs

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3064 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-09 02:27:54 +00:00
SkyMarshal
e4d4173b97 Merge pull request #388 from Tastyfish/master
job title choices! lizards speak normal, can pour things down sink
2012-02-08 18:17:30 -08:00
baloh.matevz@gmail.com
abe5e4ba9d Discontinuing the feedback logging of mineral production.
At the time when this was uploaded the 30-day logging information was...

Iron sheets produced: 75125
Steel sheets produced: 20548
Glass panes produced: 16057
Reinforced glass panes produced: 535
Gold ingots produced: 14006
Silver ingots produced: 13142	
Diamonds produced: 5835	
Uranium bars produced: 12604	
Plasma bars produced: 38098	
Bananium produced: 421
Adamantine produced: 0

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3063 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-09 02:01:23 +00:00
Tastyfish
2dc3a5cc6e fixed horribly buggy camera assembly 2012-02-08 20:56:04 -05:00
Tastyfish
0ebbe456b3 job titles 2012-02-08 20:43:04 -05:00
Tastyfish
91635c4fbd Merge remote-tracking branch 'upstream/master' 2012-02-08 18:42:00 -05:00
SkyMarshal
1e3f332efa Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	code/defines/obj/weapon.dm

Corrected a messed up type path for the security doors.
2012-02-08 12:13:03 -07:00
SkyMarshal
ffb142abae Secure Airlock update!
4 new wires, completely randomised! (2nd bolt wire, 2 only-drop-bolts wires, and an AI alert wire that alerts an AI 20% of the time, when messed with)
Emags have a limited number of uses, between 3 and 7, and cost 5 TC
Hacktools are more useful than they were, and have a lower chance of alerting the AI
(This is unmapped ATM)
2012-02-08 12:07:12 -07:00
panurgomatic
b26652944c - Reverted erroneously committed file.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3058 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-08 18:57:28 +00:00
panurgomatic
c754581c46 - Added Exosuit Jetpack
- Added Exosuit Nuclear Reactor
- Added Ripley construction steps sprites (courtesy of WJohnston)
- Exosuit Sleeper can now inject occupant with reagents taken from Syringe Gun
- Exosuit Cable Layer will now auto-dismantle floors
- Exosuit Heavy Lazer cooldown increased, Scattershot now fires medium calibre ammo (less damage)
- EMP now drains half of current exosuit cell charge, not half of maximum charge.
- Exosuit wreckage can be pulled
- Fixed several possible exosuit equipment runtimes
- Moved all mecha-related icons to icons/mecha
- Mecha equipment messages will show equipment icons in chat window
- Fixed mecha creation reports being sent at wrong construction step
- Played with changelog markup. For some reason javascript is extremely slow in byond browser, I'll look into it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3057 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-08 18:47:04 +00:00
kortgstation@gmail.com
32f4fc9d94 Fixed the cooldown time on Phase Shift (was 2 seconds instead of 20)
Lowered the lifespan of the forcewalls created by the spell Shield

Changed the "Relentless" var to "nopush" by Urist's orders (no mechanical change, but a technical name rather than a fluffy one)


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3055 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-08 17:08:55 +00:00
CaelAislinn
b38922f163 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-02-08 18:16:09 +10:00
Albert Iordache
1ae02519fc Merge pull request #380 from Abi79/master
Small code cleanup
2012-02-07 22:00:56 -08:00
kortgstation@gmail.com
b324db9b7e The armoured construct is now known as the Juggernaut. Its health was lowered and it takes massive damage from being hit with a bible. The Juggernaut has a lesser version of force wall.
Added the Wraith construct, a faster, more fragile construct which has a lesser version of Ethereal Jaunt. It too is vulnerable to bibles.

The Chaplain is now immune to blood boil, stun talismans, and cult blind/deafen

Constructs are finally creatable by using a full soulstone on an empty construct shell. The creator will be able to choose which kind of construct is created.

Cultists can get construct shells from their supply talisman

Wizards now get the spell "Artificer" which allows them to create construct shells for free when they select the soulstone belt.

Medical Borgs are now relentless to prevent them losing hold of incapacitated patients.

Added the Artificer (conjure construct shell), Phase Shift (lesser jaunt), and Shield (lesser forcewall) spells

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3054 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-08 02:58:30 +00:00
CaelAislinn
22811eaf26 added personal lockers to most departments, balanced job equipment between wardrobe closet and locker, miscellaneous tweaks (including fix to taj whisp/speak, it should work fine now except for radios)
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-08 11:47:07 +10:00
Tastyfish
5e6e477e37 allowed lizards to talk normal 2012-02-07 19:54:09 -05:00
quartz235@gmail.com
c540dde158 - Can't burn up the nuke disk in a crematorium lololol
- The message for trying to cremate nothing is now based off the crematorium instead of user
- Minor grammar fix

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3051 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-07 22:17:23 +00:00
CaelAislinn
09490b8cb0 fixed derpy ai movement.
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-08 06:16:12 +10:00
Albert Iordache
7df0181e60 Code cleanup: renamed the ID card's variable "registered" to "registered_name" for better clarity 2012-02-07 20:05:43 +02:00
Albert Iordache
a20481062c Cleaned up parts of the code, no other changes 2012-02-07 20:05:42 +02:00
Miniature
6de4139066 Sky, that was there for a reason (fixing horrible runtimes everywhere) 2012-02-08 01:25:02 +10:30
SkyMarshal
e432958ab5 Bugfixes for airlocks
Added detective work manual, that spawns on top of the detective's computer
Added RadioAlert proc
Added the capability to title the NanoTrasen updates
2012-02-06 20:24:00 -07:00
SkyMarshal
664c6b7dec AI's can now understand pAI speech
Tidied up some.
2012-02-06 11:02:49 -07:00
CaelAislinn
87838c7cc5 Merge git://github.com/Baystation12/Baystation12
Conflicts:
	code/game/gamemodes/meteor/meteors.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/new_player/new_player.dm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-07 03:28:09 +10:00
CaelAislinn
32a37c6001 fixed taj speak and taj whisper (not working over radio chat). use :j after the radio/headset commands to speak or whisper in tajaran (only taj mobs can speak / understand it)
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-06 21:27:27 +10:00
SkyMarshal
1f25c49c06 MOAR BUGFIXES 2012-02-05 21:56:12 -07:00
baloh.matevz
74aa8a4ee5 Map changes:
- A small map change at chemistry. There is now a 1 tile indent so that people running up and down the hallway don't push people waiting for the chemist all over the place.
Screenshot: http://www.kamletos.si/chemistry.png
- Some doors were replaced with glass doors (engineering exterior, engineering break room, bridge outside doors, eva left double doors)

Nerfed poly acid.

Description from #coderbus:
- When you splash pacid on someone's face, if they have a mask it melts, if they don't, but have a helmet, there is a 15% chance for it to melt, if they don't have either, they take 15 damage and there is a 15% chance for them to become unknown
- if the method is not TOUCH (whatever that means)... they take 15 damage and there is a 15% chance for them to become unknown
- on_mob_life... they now take 1 tox damage per tick instead of 1 tox + 1 burn
- reaction_obj is the same as before



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3043 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-06 01:42:02 +00:00
kortgstation@gmail.com
cb57fae3b8 The "X FAILS TO PUSH Y'S FAT ASS OUT OF THE WAY" message now only displays to the person shoving, so those nearby are not subjected to chat spam.
Added a "Relentless" var to mobs that makes them unshoveable if their intent is anything but help.

Alien Queens are relentless.

Constructs are relentless, can now push things, and have automated movement disabled (because it was bugging the hell out of me when testing)

Shades also have automated movement disabled.

The gladiator costume now has a chance to spawn in the theatre (sprites by Ausops)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3040 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-05 23:56:15 +00:00
petethegoat@gmail.com
eccfc3ed3f Committing Rolan's MMI suicide/ghosting fix. Fixed issue 143.
Comitting Nodraks's ghost ears toggle preference.

I also removed the underwear option, as it could not be toggled.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3038 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-05 19:57:08 +00:00
CaelAislinn
1593a4923e new characters' jobs are now announced by the arrivals computer
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-06 05:26:41 +10:00
SkyMarshal
85ee6ae562 Fixed a warning with meteors, HAWK: COMPILE DAMMIT
Blood now works properly.
2012-02-05 11:52:42 -07:00
SkyMarshal
429d13e980 Herp, derp made blood work right. 2012-02-05 11:22:05 -07:00
CaelAislinn
14f0f8418c readded scary sound files. got somehow removed from the git tracker
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-02-06 03:41:11 +10:00