Commit Graph

9413 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
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
n3ophyt3
b8abae2eba Fixed the recharge rates on the captain's laser, energy crossbow, and advanced energy gun.
pulse rifles can once again switch between stun, kill, and destroy (outside of the pulse destroyer, which has three settings, and they are all destroy)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2588 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-02 00:33:21 +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
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
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
Tastyfish
b344e2a442 Merge remote-tracking branch 'upstream/master' 2011-11-30 18:35:58 -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
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
1f9774b827 Merge remote-tracking branch 'upstream/master' 2011-11-29 19:33:29 -05: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
Head
43d71282e0 Added back json support / restart notice
should fix unnecessary restart after gamemode change before round start
2011-11-29 15:45:01 +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
9569430cc6 Moving recycling from WorkInProgress to modules, as it isn't wip.
Also, I could -never- find it in there.

(Please note that due to what seems to be an issue with Tortoise SVN, I have to do this in two commits.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2570 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-28 20:07:44 +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
petethegoat@gmail.com
986858f761 Fix for Ripley tele-drilling people that had run away.
Fix for mediborgs inserting their beaker into the chem dispenser. (this broke everything)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2568 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-28 19:34:08 +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
tronaldnwn@hotmail.com
9038cfdda7 Food:
Cream pies splat when thrown.
Chaos donuts more chaotic (reduced amount of reagents need to make)
Mystery stew more mysterious (Changed recipe)
Wish Soup some times grants your hungry belly's prayers (new icon).
Meat pie recipes condensed.
Grilled cheese sandwiches
Some reagent amounts may have changed as a result of me seeing them not match the amount of reagent put into making them.
Terribad food descriptions added or modified.


Autolathe has light bulbs, APC parts, and wires in the creation list!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2558 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-26 16:09:34 +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
74cc33fc02 Merge pull request #24 from CIB/master
SMES' units have a lot more initial charge now, making life a bit easier for engineers
2011-11-25 23:34:30 -08:00
vageyenaman@gmail.com
d0d3f3bbfd Hopefully fixes mutagen turning cyborgs into humans.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2554 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-25 22:18:09 +00:00
cib
b00b9674b8 SMES units have a higher initial and maximum charge now. 2011-11-24 23:24:38 -08:00
ryantennessee@yahoo.com
3107d45434 Fixed a derp where I left off a 30 unit option on glass beakers.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2552 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-24 03:02:25 +00:00
ryantennessee@yahoo.com
25f5fb7e20 changed /obj/item/weapon/reagent_containers var/possible_transfer_amounts = list(5,10,25) to var/possible_transfer_amounts = list(5,10,15,25,30)
changed /obj/item/weapon/reagent_containers/glass     possible_transfer_amounts = list(5,10,25)     to     possible_transfer_amounts = list(5,10,15,25,50)
changed /obj/item/weapon/reagent_containers/glass/large     possible_transfer_amounts = list(5,10,15,30,50)     to     possible_transfer_amounts = list(5,10,15,25,30,50,100)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2551 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-24 02:39:20 +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
tronaldnwn@hotmail.com
a8b673e37a Eggs fried, and eggs boiled.
Now you can cook them.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2542 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-22 12:51:54 +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
Albert Iordache
9440d9d296 Renamed tgstation.dme to baystation12.dme, added Bay12 admin list and moved a few admin verbs around from Game Master to Game Admin. 2011-11-21 20:01:13 +02: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
petethegoat@gmail.com
fcddc199ff New chem dispenser interface, by Tobba. Some sanity checking in power.dm, by Tobba.
Updated changelog, by PETE YEAAAH.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2532 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-20 10:24:17 +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
petethegoat@gmail.com
9840c44b4e New chem dispenser interface, by Tobba.
Some sanity checking in power.dm, by Tobba.

Updated changelog, by PETE YEAAAH.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2532 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-19 21:18:11 +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
Baystation12
c80c66a0ae Merge pull request #12 from NivvyDaSkrl/master
Fastler's changes: added ID requirements to mining processing/stacking consoles
2011-11-19 02:58:27 -08:00