Commit Graph

4401 Commits

Author SHA1 Message Date
Aussprites
89f2ee157d Added stuff for christmas. 99% done by Carn all I did was poke around and finish it off. Cracker/gift sprites done by Tanknut.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5292 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-10 05:35:40 +00:00
petethegoat@gmail.com
15a80594a6 Fixed the softcurity readme.
Added grabbing cigarettes with your mouth for Malkevin.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5290 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-10 00:56:42 +00:00
cib
173236acf0 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-12-09 17:22:43 +04:00
johnsonmt88@gmail.com
71a874e782 You can no longer steal chairs that mobs are buckled to those chairs. Fixes issue 1133.
False walls now have a variable that flips on when it's opening or closing. This should prevent the closing door code to execute after trying to open the door (or visa versa) due to the sleep()s used in there.

I've also re-organized teh  false_walls.dm file a bit. False r-walls really need to be changed into a subtype of false walls at some point.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5289 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-08 22:36:49 +00:00
giacomand@gmail.com
69fcf61ed3 Committed Rolan7's patch to add more convenience to Hydroponics. The feature list includes:
* Makes grass auto-stack when harvested
* Allows seeds to be extracted from grass
* Allows the smart-fridge and plant bags to accept seeds.
* Lays the groundwork for a seeds-only version of the smart fridge, to eventually replace the existing seed vender (not yet hackable, though)

-Fixed window doors not opening when you click on them.
-Added a reset button for the job selection screen.
-Fixed a bug with the traitor panel which leaves ex-changelings with the evolution menu.
-I re-added the variables for the intercept report but commented them out.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5276 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-07 13:27:33 +00:00
cib
ecb12fb4db Merge branch 'master' of git://github.com/comma/Baystation12 2012-12-06 16:50:28 +04:00
ericgfwong@hotmail.com
b5b2ee470f Updated supply headset names and instructions
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5267 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-06 00:46:16 +00:00
ericgfwong@hotmail.com
a3780d7021 Renamed Cargo radio to Supply radio
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5266 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-06 00:16:11 +00:00
ericgfwong@hotmail.com
f7abe34c72 Removed mining department radio frequency. Miners and Cargo techs will all be under the Cargo radio instead.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5265 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-05 23:27:10 +00:00
petethegoat@gmail.com
3ac67f339a Fixed randomised appearances being batshit crazy.
Improved the janicart a bit. It should be less cursed now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5264 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-05 22:27:16 +00:00
aussprites
5f36fdcea7 added ..() to new(), thanks to Giacom for telling me why
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5258 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-04 18:38:03 +00:00
aussprites
1dd83e6803 >added defines to flora.dm
>added icon_states to ausflora.dmi
>added a tree to pinetrees.dmi
>centcom came by and decorated the trees in the bar and chapel

Centcom Report
Have a merry griffmas and a happy new round.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5255 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-04 14:23:00 +00:00
Jim "Apples"
84bcc87e45 Merge pull request #2027 from SweeperM/master
Fixes to lighting
2012-12-03 03:09:02 -08:00
johnsonmt88@gmail.com
35cb1b2530 Removed storage.dm from defines and moved the storage item defines to the location of their respective procs.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5252 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-02 19:00:33 +00:00
Chinsky
f0ac799952 Merge branch 'bandages' 2012-12-02 21:17:11 +04:00
petethegoat@gmail.com
1cb3959037 Moved janicart into structures, and fixed some issues with it. You can now hook a trashbag onto it.
Recoloured the purple softcap to actually match the janitor's jumpsuit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5250 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-02 14:48:57 +00:00
cib
bce8c4cfee Merge github.com:Baystation12/Baystation12 2012-12-02 13:36:10 +01:00
Chinsky
507dc0c496 Better feedback messages and ability to target groin, hands and feet. 2012-12-02 16:30:24 +04:00
aranclanos@hotmail.com
4f010d9730 Fixes issue 1138 - Stashing lockers on crates.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5248 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-02 08:01:12 +00:00
giacomand@gmail.com
9941bb8587 Added mimics! There's the classic crate (chest) mimic which waits until somebody is close before trying to attack them. You can fill him with loot by putting items on him on your map. This was done by changing the base initialize proc to an /atom/movable and then instead of looping through the world for objects, instead loop for atom movables.
The next type of mimic is for the staff of animation! They will copy the icon of the object they're copying and will set themselves stats based on the object too. They will not attack the bearer of the staff which made them animated.

Added the option to get the staff on the wizard's spell book.

Added a "friends" var to hostile mobs. It will make the simple animal ignore friends when choosing targets.

Changed the statues from /obj/effect/showcase to /obj/structure/showcase.

Added a new variable to projectiles, "shot_from" is the gun that shot the projectile. It's used to determine what staff animated the mob and it will then add that staff, so it can ignore it when choosing targets.

Added a wander var for simple animals, turning it to 0 will stop the simple animal from moving when idle.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5246 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-02 04:38:43 +00:00
Cael_Aislinn
2f7baa26f8 antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-01 17:49:34 +10:00
Chinsky
85c2af3871 Started cleanup of medical stacks code.
Removed silly way to get targeted organ.
Removed child organs being affected sometimes.
2012-12-01 09:04:20 +04:00
Chinsky
2e2c1e8c4c Merge branch 'master' into crates 2012-12-01 07:14:31 +04:00
ericgfwong@hotmail.com
e550f54ad3 Readded gloves to the lockers in atmos, mining, cargo, and robotics.
Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5240 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-01 01:42:10 +00:00
ericgfwong@hotmail.com
4dab53f771 Replaced janitor's latex gloves with black ones
Removed ALL gloves from Robotics, Atmos, Mining, and Cargo
Updated my journal

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5239 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-01 01:21:17 +00:00
ericgfwong@hotmail.com
136800a071 Swapped the locations of the Vault and Tech Storage.
Cargo Techs, Miners, and Roboticists no longer start with gloves. Instead, a limited number of gloves have been added to each of their departments.

Shuttle Brig now requires Holding Cell access
Janitor given a pair of latex gloves
Red pen added to Warden's office by request


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5238 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-01 01:03:15 +00:00
petethegoat@gmail.com
92d2f44603 As usual i'm retarded and am incapable of coding properly
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5235 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-30 22:51:46 +00:00
petethegoat@gmail.com
dd909aa5f8 Added an upgraded mopbucket for the janitor and placed it on the map.
Updated the changelog.

Moved Agouri's vehicle code into his dm in unused. Moved the vehicle dmi into icons/obj.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5234 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-30 22:37:00 +00:00
giacomand@gmail.com
cd2fcfc920 -Fixed blood vomiting not hurting you.
-Removed an unneeded fingerprint proc.
-Fixed some of the blood/vomit/gibs spills not correctly processing.
-Reduced the life of a virus with no mob host.
-You can now tell how a virus spreads by the Pandemic.
-Made making vaccines quicker and making blood virals quicker too.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5232 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-30 16:37:35 +00:00
SweeperM
b8a12b0b52 Fixes to lighting
-Fixed #2005 (for sure!)
-Fixed the stacking of brightness. Now the most bright item turned ON will be the one where the user gets its luminosity of.
-Cleaned the code a bit. Now only one var controls the on/off switch of light, and another holds the value of brightness when on.
2012-11-29 23:01:51 +00:00
elly1989@rocketmail.com
727bad70e4 Fixes compile error.
More gimmicky xmas content[SPOILERS]
..
..
random event: xmas trees become hostile carp-like mobs that run around eating everybody. Only occurs on Christmas Eve/Christmas day.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5227 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-29 16:06:46 +00:00
elly1989@rocketmail.com
d0e0ec56da Added Xmas trees to the canteen and chapel.
Added Xmas and Xmas Eve holiday-features:
>If ALLOW_HOLIDAYS is in config.txt, random (harmless) wrapped presents will be placed under all xmas trees on z-level 1. :3
>Ian will start wearing a santahat
Added content for the end of the Mayan Calander.
Fixed the spelling of -invisible- pens



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5226 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-29 14:07:41 +00:00
Kortgstation@gmail.com
0c4f441cb5 Added Cheridan's slime sprites to replace roros. Replaced all mentions of roro/metroid with slime. Once Cheri has the rest of the sprites/Phol gets mutant race sprites I'll start work on redoing metroid/slime code with Giacom and adding breeding.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5223 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-29 04:12:22 +00:00
johnsonmt88@gmail.com
3f1fc2ef62 Reduced EMP grenade range.
- Traitor grenades: 10 heavy range and 20 light range is now 4 heavy range and 10 light range

- Chem grenades: Chemists can no longer make EMP grenades as powerful as traitor grenades unless they use two large beakers. They used to be able to make EMP grenades as powerful as traitor grenades, or twice as powerful with two large beakers. Now they make slightly weaker versions unless two large beakers are used.

- Updated the list of uplink items to show that EMP grenade boxes hold 7 grenades since someone forgot to change it.

- EMP grenade boxes cost 4 crystals instead of 3.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5222 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-29 02:20:09 +00:00
sieve32@gmail.com
e1815db93a -Fixed a runtime involving helperbots being hit by TK-thrown objects and mobs
-Door assemblies can now be named with a pen, and the finished door with have that name

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5220 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-28 21:30:22 +00:00
giacomand@gmail.com
6fa2a7a56b -Reverted my change with the camera in Misc Research. I'm sorry I didn't know it was used for the nearby telescreen.
-General improvements to the flare and I decreased the flare fuel. I keep under-estimating how long it lasts and I'm sorry for always changing it. I tested it in game and I'm happy with the duration.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5219 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-28 18:57:56 +00:00
cib
e11bab8ed7 Balancing emergency air tanks.
- Reduced volume by 33%, since testing revealed they currently last nearly 10 minutes
- Made *everyone* spawn with emergency air tanks, as opposed to random jobs like lawyer etc.
2012-11-28 02:32:04 +01:00
petethegoat@gmail.com
e30b79a7a4 Removed /obj/item/weapon/bodybag as it wasn't used, and updated the descriptions of the folded bodybag and normal bodybag.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5207 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-27 12:56:44 +00:00
d_h2005@yahoo.com
ffe7bc7a90 -Adds scythes
-Adds weed control crates, orderable by cargo techs, for the purpose of kudzu control.
-You can now construct folders with cardboard sheets.
-Moves newspaper sprites out of weapons.dmi

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5206 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-27 02:20:20 +00:00
elly1989@rocketmail.com
ec0376097a Replaced src=%holder_ref% with _src_=holder
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5203 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-26 19:24:03 +00:00
Kortgstation@gmail.com
09e9762e40 Added a check for the items w_class when you try equipping it to a suit storage slot. This means the ion rifle, SAW, and staff of change will no longer fit on armour.
Added a new gun/projectile which deals brainloss as well as causes hallucinations.

Replaced the pulse rifle in stationCollision with the new gun.

Gave the HoS gateway access so he can banish people.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5201 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-26 12:50:25 +00:00
giacomand@gmail.com
af523d3e8f Added a new symptom with a high level, so that it's not possible to gain through mutations.
Gave the high level symptoms their own preset diseases and added them to the virus crate, along with a bottle of mutagen.

Several disease fixes, such as disease stages going below 0. Diseases which spread by blood will longer spread when you touch someone (i.e: click on someone)

I also did some cleaning up with comments.

Made handheld radios broadcast if their messages aren't sent on the same level as they're on, meaning that turning off the relay to the station will not make it impossible to communicate with others with radios.

Made some events only effect people on the station Z level.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5192 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 21:32:07 +00:00
petethegoat@gmail.com
d9480a1407 New unarmed beartrap sprites by Cheri.
Slightly improved beartrap code while I was there, mostly standardisation and formatting stuff as usual.

Fixed the Chaplain's PDA spawn.

Reduced the chance of stealthy hulk wall smashing. All but one of the messages will attempt to go over the radio now.
Changed hulk resist text colour to red because it was barely readable in green.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5191 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 20:57:08 +00:00
petethegoat@gmail.com
c69f0cab36 Removed /obj/effect/deskclutter at last.
Updated all maps. (and updated stationCollision.dmm to have new hivebots, cmon kor)

Removed the action button from the flare, as you only ever turn it on once.
Removed a bunch of unused sprites in items.dmi.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5190 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 19:58:28 +00:00
petethegoat@gmail.com
dbd759477e Improved window code, mostly formatting and styles, but also general improvements.
I've tested it a fair bit, but there may be bugs, so please report those if you run into them.

Added an ismetroidadult() helper

Improved L6 code.
Made the syndie shuttle console impervious to bullets.
Made mirrors breakable.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5187 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 17:09:38 +00:00
johnsonmt88@gmail.com
8ae9dfd947 Removed the MASKINTERNALS from /obj/item/clothing/mask flags. There is no reason for -every- mask to act as internals.
Added an issilicon() check to the PDA's remove id/pen verbs so that the AI can no longer be rendered helpless if they happen to click the 'Remove Pen' verb. Fixes issue 1124.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5186 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 04:01:54 +00:00
johnsonmt88@gmail.com
4ddf9100f5 Sending a message should no longer work if you are incapacitated. Fixes issue 1120.
Moved some mob vars to carbon:
mob/var/handcuffed -> mob/living/carbon/var/handcuffed
mob/var/legcuffed -> mob/living/carbon/var/legcuffed

As a result, I've turned some procs into pure virtual procs and moved their code into carbon.dm.

mob/proc/restrained() -> mob/living/carbon/restrained()
mob/proc/can_use_hands() -> mob/living/carbon/can_use_hands()

The hand and legcuff portion of mob/proc/u_equip() was moved into mob/living/carbon/u_equip().

The handcuffed portion of mob/proc/show_inv() was moved into mob/living/carbon/show_inv().

Fixes issue 1114.

Made parrots immune to bear traps since parrots should be flying over them anyway.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5184 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 00:28:47 +00:00
giacomand@gmail.com
c6a4b991bc TELECOMMUNICATION
Improvements to Telecomms. I wasn't happy with my relays and having telecomms send several messages on different Z levels was not effecient. I decided to overcome this by removing the need to attach Broadcasters and Transmitters to relays. Then I made relays just add to the signal data which z levels the message will be broadcasted on, instead of sending the message several times. It's a bit hard to explain but basically it should be better then ever, and adding more relays will not create serious performance issues. Since you can't control whether the Z level could only receive messages or only send them, I added options on the relay itself so you can set it. I then made an additional feature, which Nodrak gave me the idea for, which is that busses can change the frequency of a signal. It's an option on the Bus and you can set it to change the signal's frequency, which can create hilarious situations such as the command channel being redirected to the general channel. No way to duplicate a signal with a different frequency at the moment.
Since relays earlier depended on a stupid system in order to become a off-site relay, I instead just made it limited to the satellite Z level, which makes more sense.

Broadcasters and Receivers are linked to the HUB, but it's still possible to create a simple telecommunication system with a "Receiver -> Bus -> Processer -> Broadcaster" (though it will be slow)

OTHER

Smartfridge limit was lowered to 999, just below the infinite loop check limit. This is to prevent further issues that may occure.

Moved creating some icon datums above the SQL procs, just to make sure that the SQL itself isn't sleeping and causing issues with the datums being used before being loaded.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5183 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 00:08:29 +00:00
Kortgstation@gmail.com
95b109ff62 Ported hivebots over to simple_animal
Ported viscerators over to simple_animal 

Updated spawning grenades to match.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5180 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-24 17:02:12 +00:00
Kortgstation@gmail.com
5ee5d21004 Replaced all of Agouri's stolen google image search posters with player created ones.
Sadly there are now only 10 instead of 17, but whatever.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5178 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-24 15:11:36 +00:00