Commit Graph

551 Commits

Author SHA1 Message Date
Miniature
2159409d53 Merge branch 'master' of git://github.com/Baystation12/Baystation12
Conflicts:
	code/game/vote.dm

Because I did it derpily.
2011-12-03 19:30:28 +10:30
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
Tastyfish
8c596e5c53 added sleeping on logout, willful sleeping, custom event message, slots 2011-12-02 17:28:24 -05:00
CompactNinja
79e8ad760b AI icon stuff from old code. Also fixed some of Mini's derping.
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
2011-12-02 21:18:29 +10:30
CompactNinja
e2f4d44cbd Added old cyborg module sprites. Cyborgs can now select multiple styles, if there are multiple styles to select from.
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
2011-12-02 19:59:11 +10:30
ryantennessee@yahoo.com
ac581158ca Moved 2 borg chargers from robotics to the maint hallways outside security and medical. Changed around borg module order to make it easier to pick things.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2590 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-02 08:00:16 +00:00
LastBattaWolf@hotmail.com
b00324f430 fix for issue 224 by quarxink desu
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2586 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-01 21:56:08 +00:00
Tastyfish
fc5097929e Fixed 3+ character slots bug 2011-11-30 23:34:23 -05:00
Tastyfish
0b28c04e8c Nanotrasen laws, nobody likes you asimov 2011-11-30 19:23:37 -05:00
CompactNinja
13ab6b5e56 Crew manifest on join screen.
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
2011-11-30 14:48:14 +10:30
headswe
098ec4138d Merge pull request #44 from Tastyfish/master
Added multiple character slots! ie #31
2011-11-29 16:45:06 -08:00
Tastyfish
719002dbee Added multiple character slots! 2011-11-29 19:32:07 -05:00
ryantennessee@yahoo.com
b3bf2edb80 Derped the file names. fixing.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2576 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-29 21:18:54 +00:00
ryantennessee@yahoo.com
a728ae8863 Changed medborgs to hold 1 pill each of dexalin, anti-toxin, kelotane, and bicaradine. Added bicardine pill to chemistry tools. Added borg recharging station to medical, security, and janitor closet.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2575 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-29 21:14:37 +00:00
Head
e1df14b5c1 Forgot to call makejson() 2011-11-29 18:15:49 +01:00
CompactNinja
6df7528b16 Bunch o hair stuffs.
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
2011-11-29 14:03:52 +10:30
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
25f8e20822 New adminshit. A verb that lets admins force players to have completely random identities when they join/latejoin. Only works before rounds.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2564 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-27 21:51:39 +00:00
petethegoat@gmail.com
edf76efd86 Fixed issue 205.
Cyborgs can now just walk into recharging stations.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2560 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-26 18:16:10 +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
rockdtben
e7a0a44ea4 Implemented adjustToxLoss(amount)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2535 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-20 10:25:24 +02:00
vageyenaman@gmail.com
8f734c9bc6 ◦ Toggling midis will now disable the current midi(s) playing. How fucking cool is that?? ◦ Fixed a bug for metroids: the AI loop was not canceling when a player was inserted into the mob.
◦ A few icon additions for future updates, namely the terminals and plasmatoids.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2531 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-20 10:21:34 +02:00
StrumpetPlaya
593e380133 Screen flashes red when hit by melee or projectiles. 2011-11-20 02:54:48 -05:00
StrumpetPlaya
1c580d1359 Speech Bubbles. 2011-11-20 01:23:55 -05:00
rockdtben
f733c08847 Implemented adjustToxLoss(amount)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2535 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-20 00:12:49 +00:00
vageyenaman@gmail.com
c5043cdb78 ◦ Toggling midis will now disable the current midi(s) playing. How fucking cool is that??
◦ Fixed a bug for metroids: the AI loop was not canceling when a player was inserted into the mob.

◦ A few icon additions for future updates, namely the terminals and plasmatoids.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2531 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-19 18:53:27 +00:00
Albert Iordache
e72ec83af6 Merge branch 'master' of github.com:Baystation12/Baystation12 2011-11-19 10:51:02 +02:00
unknown
1254a34822 Test Commit - Reduced running speed to be similar to BS12. Increased
walking speed.
2011-11-18 00:24:28 -05: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
5b81f6ffa3 Additional borg skin choices for the Security, Engineering, Medical, and Janitor modules removed.
New sprites by vey added.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2527 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-16 22:47:37 +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
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
mport2004@gmail.com
8140cf0f12 Beepsky was freaking out that his target got away (vanished) and almost crashed the server, this has been fixed.
Fixed a few other runtimes.
Space movement should be working slightly better.
Projectile weapons now give a X has fired Y message, this might get removed in the near future depending on how spammy it ends up being.
Projectiles now give a X has been hit by Y rather than a X has been shot by Y because knowing who shot you when you could not see them was rather silly.
Securitrons will no longer scan for weapons when they are set to not scan for weapon auth, they also will nolonger ignore arrest status if set to check for weapon auth and the guy has it.
Shotguns are nolonger on the Securitron's ignore list if weapon auth is on while all melee class weapons like eswords and batons are now on the list.
The incinerator disposal is part of the station loop.
A window has been added to the north side of tool storage.
Emergency Storage now has the proper access.
Disposal's mass driver control will no longer fire tox's mass driver. 
Removed a few old grey pipes in the courtroom.
Toxins test chamber once again has a teleportation beacon.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2495 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-07 10:19:24 +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
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
b46010ab2b Fix for save files. This might be totally unnecessary, but I doubt it.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2479 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-04 01:56:42 +00:00
petethegoat@gmail.com
6b7d4efb03 VEY VEY VEY VEY.
Added the "Surgeon" mediborg sprite.
Laser gun inhands! Woooooaoaaahah.
Fixed up some hair and shit, added alt half-bang hair.
Some fixes for the Bloodhound.
MOTHERFUCKING WIRES! Almost no one will appreciate this, I have no doubt. But -I- appreciate it.
New tinted window sprites.
VEY VEY VEY VEY.

Oh, and I gave the laser cannon a new description.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2478 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-04 01:30:10 +00:00
mport2004@gmail.com
fdddd35ee2 Singularity beacons now require a powered cable to function.
Minor AI runtime fix.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2469 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-01 02:48:56 +00:00
kortgstation@gmail.com
81e2f26706 New Secborg skin by Vey
New Lasergun sprite by Vey

Various fixed in hands (by Vey)

Added a retrolasergun which uses the old sprite, put one out in space for people to find


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2465 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-31 22:33:25 +00:00
baloh.matevz
1f9a77c377 Update to feedback gathering:
- Rounds that end in invalid ways will now be logged,
- Round results are logged

- Rounds that don't end with a code-determined reboot will still not log at all (so rounds that end in a crash will not log at all - not even round start or mode.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2457 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-30 18:42:19 +00:00
mport2004@gmail.com
0604eabf1e Quick null check so the hair quits spamming runtimes.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2453 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-30 10:02:41 +00:00
mport2004@gmail.com
38eac59207 Forgot to change the latespawn job proc to check for -1.
Fix for the savefiles, version<5 jobs will now load properly.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2452 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-30 08:38:11 +00:00
mport2004@gmail.com
9a2ee43b59 Fixed some runtimes.
Job system once again has -1 as unlimited.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2451 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-30 07:14:17 +00:00
vageyenaman@gmail.com
d93f83e593 Hair and Facial Hair Overhaul:
○ Hairs are now defined in /datum classes located in the new file sprite_accessories.dm. Further explanation and documentation can be located in this file.
   ○ As a result of the above change, some new_player preferences code had be reworked. Savefile versions have also been updated, and a small conversion proc has been placed to prevent file corruption and mis-matched variable data.
   ○ The final result of all of these changes is a simpler, pain-free way to add in new hairs. It also makes the code much more readable.


Other stuff:
   ○ Three new hairstyles (mostly female), one new beard.
   ○ Updated the changelog.

Final bugfixes:

   ○ Fixed xray superpower preventing you from using any kind of HUD eyewear.
   ○ You can no longer strangle metroids - instead, attempting to strangle them will result in you "squeezing" them.



The new hair system, while thoroughly tested by myself, is very prone to bugs given its very prototype state. Any bugs are to be reported via Issues.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2444 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-29 17:06:37 +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
mport2004@gmail.com
fc99f3da81 Meteors have been updated to the slightlynewer health system
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2432 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-27 09:59:09 +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