Commit Graph

710 Commits

Author SHA1 Message Date
Miniature
f62eccc76b Merge branch 'master' of git://github.com/Abi79/tgstation13-git
Conflicts:
	baystation12.dme
	code/defines/mob/mob.dm
	code/defines/obj/vending.dm
	code/game/atom_procs.dm
	code/game/dna.dm
	code/game/machinery/computer/aifixer.dm
	code/game/vote.dm
	code/modules/chemical/Chemistry-Machinery.dm
	code/modules/chemical/Chemistry-Reagents.dm
	code/modules/mob/living/carbon/metroid/life.dm
	html/changelog.html
	icons/obj/stationobjs.dmi
	interface/skin.dmf
	maps/tgstation.2.0.8.dmm
2011-12-03 19:28:10 +10:30
petethegoat@gmail.com
a80e46c078 Fixed issue 222.
Improved closet/secure closet/crate code a bit. (Updated the paths on the map.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2585 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-01 20:02:43 +00:00
Tastyfish
0b28c04e8c Nanotrasen laws, nobody likes you asimov 2011-11-30 19:23:37 -05:00
Tastyfish
26e1bfdaf1 Added vending charges, removed clown/mime from main joblist, sec belts fixed 2011-11-30 18:34:43 -05:00
petethegoat@gmail.com
85cb13fe95 Reverted the janitor closet to the old trashbag. (It does work, I fixed it up in r2557.)
A bunch of fixes for various stuff that's been broken about the bag of holding. It should work as intended, now.
Made wet floor signs fit in boxes.
Cleaned up the janitor's closet a bit.
Optimised the vault wiring a bit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2580 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-30 15:02:01 +00:00
ryantennessee@yahoo.com
2883e40c19 Added additional transfer amount options to the medborg's inoprov and anti-tox vials.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2579 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-30 06:49:40 +00:00
kortgstation@gmail.com
763c0ecf71 Can now make light tubes/bulbs in the autolathe
Old trashbag was buggy as fuck and useless. Didn't touch it's code, but replaced it's spawn in the janitors locker with a 20 slot, tiny item only storage object (new trashbag)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2577 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-30 05:35:40 +00:00
petethegoat@gmail.com
1cd49a6f13 Replacing monkie with monkey...
Replaced 11 strings in 8 files

Shout at me if this breaks anything.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2569 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-28 19:39:22 +00:00
vageyenaman@gmail.com
1d255c8f8e Changelings can no longer have their DNA modified at all through any means (except adminfuckery perhaps). Sorry, you can't clone changelings now through UI+SE abuse! Borg them instead.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2566 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-28 03:41:45 +00:00
kortgstation@gmail.com
e3d8fe0b78 Husks can be borged again (if traitors have to hide bodies to avoid being tattled on by a clone, changelings can deal with it as well. You can change faces as well if you'e really worried about being caught)
Changeling genome requirement lowered from 8-12 to 6-12 (APPROVED BY MUSKETS COME AT ME URIST)

Regen stasis now heals cloneloss (in case you suffer a metroid accident)

Added a "summon creature swarm" spell for later use in cult.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2565 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-27 23:25:56 +00:00
uhangi@gmail.com
48bd33c65e Fixed a bug where you could conceal things in PDAs.
..really sad I can't abuse this.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2563 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-27 13:36:51 +00:00
petethegoat@gmail.com
2190408f0f Massively improved trashbags. PICK UP EVERYTHING! Fixed issue 209.
Slightly improved mops, and got rid of the "X attacks the blood with the mop!" message.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2557 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-26 15:58:50 +00:00
rockdtben
1de1be054d Implemented more getters/setters for damage system. 2
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2556 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-26 13:33:18 +00:00
Baystation12
c1cc954e94 Merge pull request #22 from Tastyfish/master
Merged tg's and bay12's paper code, and closed a possible exploit.
2011-11-24 03:21:07 -08:00
Tastyfish
cc14ed34a5 Merged best of tg's and bay12's paper code, and closed a possible exploit 2011-11-23 23:09:18 -05:00
vageyenaman@gmail.com
fd67a22afd Final fixes for the firing range. This SHOULD be the last of them.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2550 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-24 00:29:36 +00:00
vageyenaman@gmail.com
0b1318997c Removes unnecessary debugging crap.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2547 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-23 21:30:28 +00:00
vageyenaman@gmail.com
f6a04f25f6 Quickfix for some weird visuals in the firing range.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2546 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-23 20:54:36 +00:00
vageyenaman@gmail.com
c02d3d88e3 Just a quick fix for my last commit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2545 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-23 02:55:56 +00:00
vageyenaman@gmail.com
c8452fa96b ◦ When equipping corgis with objects, their icons immediately update. Fixes a bit of visual lag.
◦ The kitchen and booze vending machines have some changed commodity values. Most importantly, kitchen has more eating utensils and trays.
◦ Changed the afterattack() and DblClick() to have the (location,control,params) parameters.
◦ Added a new radio filter, "RADIO_MAGNETS".
◦ Mucked around with /datum/signal. Just an extra variable and another comment.
◦ Guns' afterattack() proc now carries location,control,params.
◦ Projectiles now track exactly where the player clicked on a tile. Pretty neat, huh?


New stuff:
   ◦ A new machine has been added: magnetic generators. They fit under floor tiles and can create dyanmic magnetic fields by directing ionized proton/electron beams to another tile.
   ◦ Another machine/computer was added that can control these magnetic generators. These machines come with their own pseudo-scripting engine for directing the magnetic beams magnetic modules create. They're not really complete yet, but they work for the firing range. I plan on expanding on this maybe sometime in the future, creating more applications for magnets elsewhere.
   ◦ Firing range things have been added, including target stakes and targets (both sprited by Veyveyr). You can mount targets onto target stakes and shoot them. Pixel-precision aiming has been applied to the targets (ONLY THE TARGETS!) so that you can see where you shot it and whatnot. You can literally blow holes through the targets until they collapse on themselves.
   ◦ Added a small little manual to the firing range on how to use the new stuff. It hopefully isn't too complicated to use.


    

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2543 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-23 02:00:18 +00:00
kortgstation@gmail.com
38c25cbbe7 Re-added PALADIN to the upload because people were complaining (corporate is still there though)
Fixed corporate having null origin tech

Fixed the desc on the science goggles fuck you superxpdude dont touch my shitty gimmick items without asking

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2541 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-22 11:11:58 +00:00
mport2004@gmail.com
7c8ed7b030 Signalers will now work with the PDA Signalers.
Numpad may once again be used to type numbers and operators.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2539 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-21 07:25:48 +00:00
rockdtben
84888d5ec3 git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2536 316c924e-a436-60f5-8080-3fe189b3f50e 2011-11-20 15:53:23 +00:00
StrumpetPlaya
593e380133 Screen flashes red when hit by melee or projectiles. 2011-11-20 02:54:48 -05:00
Albert Iordache
028014415f Merge branch 'master' of https://github.com/Abi79/tgstation13-git
Conflicts:
	html/changelog.html
2011-11-19 10:48:17 +02:00
rockdtben
38d90773cc Implemented getToxLoss()
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2528 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-17 23:42:09 +00:00
petethegoat@gmail.com
d49739c021 Fixes issue 178. Including placing modules into disposals.
Removed the maze button from the admin panel, no more dumb runtimes from that.

Window fix by Tobba, which lets you attack a window with a crowbar when you're unable to pry it into or out of the frame.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2526 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-16 20:42:05 +00:00
petethegoat@gmail.com
db89732ce8 Fix for husk revival.
(probably fixes some dna modifier runtimes which relate to husks. see: http://pastebin.com/r2PE5tvU)

Small fix for putting stuff in microwaves. Rest of the microwave code is still dicks, though.

Fixed shards always appearing in the top right corner.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2521 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-14 19:16:35 +00:00
rockdtben
faee0422ae implemented getOxyLoss()
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2520 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-14 14:44:52 +00:00
petethegoat@gmail.com
7830c037c8 Fixed issue 194.
Added proper atmos tech jumpsuit, engineering jumpsuit, and rad suit inhands.
Adjusted some other inhands, including a fixed yellow suit inhand.
Added vey's proper stun baton onbelt sprites.

Changed the security flavoured EOD closet to a regular one. (reasoning being that the Sec version looked terrible)
Fixed the intercom in the bar.
Adjusted EVA to be slightly less messy.

Made the welding mask toggle position on attack_self().

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2514 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-11 17:43:40 +00:00
trubblebass@gmail.com
65d2d51f0f - Fixed a typo in light-tile construction that has been annoying me.
It should now read "You attach the wire to the glass"
Instead of "You attack the wire to the glass"

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2510 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-10 19:24:01 +00:00
rockdtben
ff84314ce6 Added a getBruteLoss() proc to mob.dm and then replaced all calls of bruteloss with it. Except for the ones commented out.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2505 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-10 14:45:25 +00:00
Miniature
2f7054128d Ported hand labeler 2011-11-08 23:47:08 +10:30
uporotiy
c4b1663853 Fireaxe now has 18 force when wielded instead of 30. It destroys windows and grilles in one hit, however.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2492 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-05 20:50:12 +00:00
mport2004@gmail.com
fbd0a5a9b5 Timers will no longer go off when you set them to 0 unless they are on.
Unsimulated turfs can be climbed on once more.
Small blobs can use the blob to move around in space.
Jetpacks now have a toggle for the stabilization.
Jetpack fuel use has been reset to .01.
Moved most of the tanks over to a new folder and files so they are not all crammed into one.
The meteor event actually spawns more than one wave worth of meteors.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2488 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-05 05:25:22 +00:00
petethegoat@gmail.com
f9adadbd03 Map fix for the interrogation room, so it actually has a screen again.
Fix for nuke uplinks not having hacked AI modules or revolvers available. (Thanks, Mport)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2481 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-04 12:51:31 +00:00
mport2004@gmail.com
ec507d8277 Anything that used the updateappearance proc will no longer update hair/beards. The things that use it are DNA changes, Cloned mobs, Changlings. The proc was runtiming due code on lines 234 and 246, I looked into it a bit but don't currently know how to fix it. The proc is currently commented out so at least the skin color/body updates properly.
Thanks to Exadv1 the reagent checking code for chem got a nice performance tweak.
Minor text change to the steal ai objective.
Few runtimes/nullchecks fixed.
HoS does not spawn with a flash, Warden does not spawn with a taser, Security officers now spawn with a flash.
Wizarditis has been uncommented and nerffed quite a bit.
Moved most of the suits over to the clothing module folder.
Force 0 items won't damage humans.
The two lockboxes have been readded to the armory.
The brigs extra large power cell has been cut in half. (still twice as large as normal apcs)


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2480 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-04 12:14:39 +00:00
petethegoat@gmail.com
6d700b0704 Fixed a small bug with meteors.
Adjusted the interrogation room. The intercoms start set up properly now.
Fixed some areas.

Guest commit by Blaank:
Corrected firelock position of medbay front desk.
Added firelocks to medbay storage.
Changed supply shuttle eta screen in cargo bay dock from layer 3 to layer 4 to make it more visible.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2477 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-03 19:07:56 +00:00
panurgomatic
3517810d11 - Added atom/proc/search_contents_for. Recursively searches through all contents of all atoms inside specified one for matches, returns a list of found atoms.
- Added teleporter datum. do_teleport proc is now just a wrapper for it.
- Added damage absorption to mechs.
- Added mecha step and turn sounds.
- Cleaned effects code a bit.
- Metal foam should now block air movement.
- Since sd_ lightning library chops areas into pieces, turrets now work with master area.
- Tried to optimize DesignHasReqs proc.
- Added plasma converter and laser cannon mecha equipment.
- Other cosmetic changes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2463 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-31 22:09:36 +00:00
petethegoat@gmail.com
c122bee94b You can now store C4 in whatever, without blowing yourself up.
Changed the armoury layout a bit, Sec got two more riot suits, and lost two empty lockboxes.
Changed the medical room in Sec to an interrogation room! Credit to Smoke Carter for the design.
As a result, Mr Fixit has been powered off and returned to the armoury. Deploying him every round is likely to be a good idea.

Feedback is always welcome, especially from Sec Officers.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2462 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-31 22:05:29 +00:00
uporotiy
66b61f1fa1 Facehuggers now can be purged with fire.
Fixed a bug with Lamarr being non-sterile (or rather, with his sterility not affecting anything).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2455 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-30 13:12:45 +00:00
petethegoat@gmail.com
c7daef1773 Forgot to update spec ops crates and the stealth bundle.
The sleepypen on the nuke shuttle is intentional.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2448 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-29 19:35:35 +00:00
petethegoat@gmail.com
2f84e522cb Stunglove overhaul: part two- gloves now lose all insulation when you wire them up.
Sleepypens have been removed!
Paralysis pens have been slightly nerfed, but look like regular pens.
Changed uplink implants to give five crystals instead of four.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2447 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-29 18:44:31 +00:00
uporotiy
2a131d302c A bug with huggers hugging a person with an unremovable mask, fixed.
A verb which makes all nearby huggers activate, reintroduced.
An acid verb's wording, changed.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2440 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-29 08:44:36 +00:00
petethegoat@gmail.com
7524bca986 Stunglove overhaul: part one.
Stun gloves are now made by wiring a pair of gloves, and then attaching a battery- this shows up on the object sprite, but not on your character.
Stungloves use 2500 charge per stun! This means that some low capacity batteries will make useless stungloves.
To get your old inconspicous gloves back, simply cut away the wire and battery.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2439 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-29 02:15:50 +00:00
uporotiy
c0d8adf42f Facehugger overhaul
They now function like landmines. They don't move, but you can pick them up and throw them at people.
Eggs now grow gradually and you can harvest a hugger from a grown egg.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2438 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-28 17:17:01 +00:00
rockdtben
6655414f12 Modified the PowerUp Cart so that its process was local rather than global. You can now choose which Power Monitor to view.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2436 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-27 23:24:54 +00:00
mport2004@gmail.com
9ca449bf7a New WIP TK system added. To activate your TK click the throw button with an empty hand. This will bring up a tkgrab item. Click on a non-anchored (currently) non mob Object to select it as your "focus". Once a focus is selected so long as you are in range of the focus you can now click somewhere to throw the focus at the target. To quit using TK just drop the tkgrab item.
The captains laser, aegun, and xbow recharge a bit slower now, they recharged so fast that you almost never had to stop shooting. 
Cleaned up the cyborg_modules file
Medical and Security borgs have a hud item.
Medical bots bottles hold 60 of their chemical (up from 30).
Medical bots now have three syringes that are labeled "Syringe-(Inaprovaline)", "Syringe-(Anti-Toxin)",  and "Syringe-(Mixed)".
Medical bots now have two kelotane/dexalin pills (up from 1/ea).
Engineering bots got a new RCD thats just like the old one but the code is cleaner and meant for borgs only.
Husks brains can no longer be cut out.
Healing hands code has been removed till whoever wants to finish it adds it to a place that is NOT the base click procs.
Added veyveyr's nuke team weapon.  Its more or less the Uzi with a new icon.
Nuke teams also got a bit of extra ammo and a few more pinpointers/eguns in their locker.
Glass doors will not set opacity to 1 after they close.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2431 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-27 08:37:40 +00:00
kortgstation@gmail.com
a2557781f4 Added Vey's Jensen set+a shitty dermal "helmet" I made
Removed the nurse outfit from the theatre cause it spawns in medbay anyway


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2430 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-27 03:44:59 +00:00
baloh.matevz
d090ec651d You can now no longer toggle your flashlight, lantern, pen light or hardhat when in closets or other containers. This it to prevent some strange abnormalities. Urist said he'll fix it more in-depth by making a new item-lighting interfacing system, but after 3 weeks he has yet to deliver on his promise. Until then this is a temp-fix (And because I know Urist won't ever deliver, this is a permanent fix.)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2419 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-22 16:00:47 +00:00