Commit Graph

737 Commits

Author SHA1 Message Date
Albert Iordache
c68a22f497 Merge branch 'SkyMarshal-764432e' 2011-12-10 12:35:15 +02:00
Albert Iordache
6c992058e4 Code cleanup + gravitational anomaly readded 2011-12-10 11:59:40 +02:00
Albert Iordache
64106be003 Merge pull request #82 from SkyMarshal/3319b22adf33c757fc42aa515bc05db894fd0e90
Lot of tweaks and fixes, read the description.
2011-12-10 01:43:34 -08:00
SkyMarshal
61d21b3cab Added the ability for borgs to ude departmental radios 2011-12-08 22:02:46 -07:00
Albert Iordache
3efa552eda Merge branch 'master' of https://github.com/Miniature/Baystation12 into Miniature-master
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
2011-12-09 14:56:32 +02:00
unknown
8f11c4acfb DO NOT USE. 2011-12-08 17:07:25 -07:00
SkyMarshal
0da1bea7c0 Add BS12 Space Law, remove Gravitational Anomaly event 2011-12-08 13:51:10 -07:00
SkyMarshal
d7eb6e4ae6 Remove Cyanide, add Sleepy Pen and Thermals to uplink, remove cloaker 2011-12-08 12:35:10 -07:00
Albert Iordache
dd6ddaa8c3 Revert "removed cloaker"
This reverts commit 1fa97843f8.
2011-12-08 15:28:35 +02:00
Tastyfish
1fa97843f8 removed cloaker 2011-12-07 12:29:04 -05:00
Tastyfish
e51459600f Merge remote-tracking branch 'upstream/master' 2011-12-07 11:21:50 -05:00
Tastyfish
455b61d9c8 hand labelers have been broken since the first commit.. 2011-12-07 00:32:02 -05:00
Miniature
af301633f6 Merge branch 'master' of git://github.com/Abi79/tgstation13-git
Conflicts:
	baystation12.dme
	code/defines/obj/vending.dm
	code/game/machinery/vending.dm
	html/changelog.html
	maps/tgstation.2.0.8.dmm
2011-12-07 07:53:20 +10:30
Albert Iordache
92045315a3 Merge pull request #72 from Strumpetplaya/master
Security now has maintenance access.
2011-12-06 09:46:00 -08:00
baloh.matevz@gmail.com
cb19629c18 Wrenches no longer spawn with a random pixel offset to the right.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2628 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 14:39:19 +00:00
StrumpetPlaya
4489db546d Added detective stuff - fibers.
Left out bloody footprints for now.  Not sure we want that with the
current system of corpses dropping blood spatters all around when dragged.
2011-12-06 07:12:19 -05:00
uporotiy
4764cdc990 Aliens:
Reworked the code to use a new "plasma" var instead of toxloss for their powers.
Facehuggers are now active for 30 to 60 instead of 3 to 5 seconds.
Aliens can see whether facehuggers are active without needing to examine them.
Changelings:
Ranged sting is now 2 squares-ranged instead of 3 squares.
Space:
Reverted the randomly accessible z-levels back to how they were (derelict and ai sat).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2627 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 08:30:03 +00:00
Tastyfish
68c6b97fd3 everyone cult!, paper label 2011-12-05 23:19:39 -05:00
uhangi@gmail.com
44c0cfc46d -Adding pepper spray for security officers.
-Fixed a storage bug for chemsprayers and space cleaner

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2618 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 22:42:18 +00:00
LastBattaWolf@hotmail.com
430cca3300 (GIVE POLYBLUE COMMIT ALREADY) Headrevs can no longer be borged, and revs who get borged are dereved.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2614 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 19:55:01 +00:00
uhangi@gmail.com
58b573ceec Committing grenade fix
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2610 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 10:17:13 +00:00
LastBattaWolf@hotmail.com
145625b699 Cleaned up some more sounds and prepped ambistat.ogg and ambibar.ogg for their future as title music
(For PolyBlue) Flashbangs now affect people in lockers

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2608 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 08:45:39 +00:00
petethegoat@gmail.com
ea9302e213 My side of the Christmas update.
Removed the RCD's ability to take down r-walls.
Updated the changelog.

Slight update to stack construction in preparation for buildable light fixtures.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2602 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 03:14:07 +00:00
baloh.matevz@gmail.com
f9badcefe1 It is no longer possible to make reinforced metal from metal sheets or vice versa. The reason for this is on Pete's side. The intention is to make RCD's not able to take down r-walls, however at the same time make r-walls harder to make.
The way you make reinforced metal now is by using the mining processing unit. The recipe is a combination of metal and plasma ore.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2601 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 03:05:44 +00:00
Albert Iordache
56220098b8 Merge pull request #58 from Miniature/master
Merged with /tg/ code.
2011-12-03 12:54:47 -08:00
Albert Iordache
d97e62ecd8 Modified the transmission delay to 0, to allow people to broadcast on the radio at the same time. 2011-12-03 23:01:30 +02:00
petethegoat@gmail.com
5d4b707553 Fixed all known problems with vending machines.
Fixed a minor visual bug with emagged lockers.
Minor botany rebalance by Numbers.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2595 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-03 15:36:17 +00:00
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