Commit Graph

9456 Commits

Author SHA1 Message Date
FireFishie
fae6f2eecd "Space Law" on the wiki is always capitalized, so now it should be in-game too. 2012-07-31 04:45:07 -04:00
FireFishie
60c962ebb8 Clipboard added to the head of personnel's wardrobes and starting items. If the quartermaster has a clipboard on him and in his wardrobe bag, then his boss should too. 2012-07-31 04:36:32 -04:00
vageyenaman@gmail.com
5dbe1c2458 This fixes an exploit that would let people use ChemMasters to spawn an infinite amount of any reagent.
NEVER trust a clients' href input to be legitimate, always have failsafes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4244 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-31 07:55:03 +00:00
baloh.matevz
e6f7615342 - Standardized the code in code/modules/research
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4243 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-31 06:01:55 +00:00
baloh.matevz
a3d9123edd - Added a sprite "7" to the sd lighting file as it was used, even if it didn't exist.
- Piped 3.0.0 a bit.
- Standardized code/modules/power. 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4242 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-31 05:24:37 +00:00
FireFishie
eac1335607 Added the warden jacket and pepperspray to the warden's wardrobe, and added fingerless gloves to the cargo technician and shaft miner wardrobes.
The janitor spawns with a portalathe but doesn't have one in his wardrobe, so this adds that. If the librarian gets a barcode scanner in his, then the janitor's should include the portalathe.

The captain has taken a few lessons from the head of security! When joining, the captain will now start with matching gloves, a pair of jackboots, and the more sensible captain's cap. The old Napoleonic hat is still available in the captain's closet, and both the closets and wardrobes were updated to reflect this change.

The quartermaster started with brown shoes, but only had black ones available in his wardrobes. This change should make his starting equipment more consistent.

The head of personnel should no longer be so paranoid, and now spawns without wearing body armor or a helmet. Additionally, the body armor and helmet from the wardrobe closet and bag were removed. A gun, helmet, and body armor are still available in the secure locker for emergencies.

The breath mask inside the engineer box included with the ERT backpack looked terrible when worn with the ERT helmet, yet was required if any of the team were operating near a breach or anything. This change only returns the removed SWAT mask (which leaves the helmet sprite intact) to the response team's basic equipment.

Both the secure closet and the wardrobe bag have the medsci headset in it, and the chemist lab is conjoined with research, so why shouldn't the chemist start with that headset? This commit also moves the chemist to Medical on the roster because that's where the job shows up everywhere else.
2012-07-31 01:21:44 -04:00
FireFishie
8c7592fa00 Changed all entries of "Nanotrasen" to "NanoTrasen" and corrected the misspelling of "apologize" in the gravity toggle messages. 2012-07-31 01:14:14 -04:00
sieve32@gmail.com
8658a64dc3 -Redid admin_list to be based off clients rather than mobs (Why I did it with mobs first, I'll never know). This fixes AdminWho and Asay and such not working pre-game.
-Added in the proper list stuff for changeling stasis
-Added a verb to the debug list (Game Admin+) to check the mob lists instead of requiring the item (Works the same way)
Fixes Issue 708


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4240 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-31 02:02:30 +00:00
johnsonmt88@gmail.com
6a9b24a178 Runtime fixes:
- Robots being deleted passed the mmi object to the mob list instead of the mmi's brainmob

- DNA injectors were checking for a user, but not for a mob.

- DNA computers would try to modify the dna of a mob that no longer existed.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4239 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-31 01:19:22 +00:00
johnsonmt88@gmail.com
4dc76c7c51 Bit of standardization and optimization for life procs that I wasn't able to finish when I did it to humans a while ago.
Basically if a mob is alive, it'll run a set of procs and if it's dead, it'll skip them.

I've also done a couple minor tweaks to metroids including minimal optimization and moving their targetting stuff out of life.dm() and into handle_targets(). That part isnt really necessary but it helps clean up the life() proc.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4238 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-30 22:59:54 +00:00
Albert Iordache
c7d3fa6bbf Merge pull request #1556 from Nerezza/atmosgear
Red hardhats for atmos!
2012-07-30 14:27:27 -07:00
Nerezza
b6d6dc2574 modified: code/game/jobs/job/engineering.dm
modified:   code/game/objects/closets/wardrobe.dm
2012-07-30 13:09:52 -05:00
Nerezza
973c1ea876 Update code/modules/customitems/item_spawning.dm 2012-07-30 12:32:35 -05:00
sieve32@gmail.com
7a1a22f8fa -Gets rid of a global list proc that shouldn't be there
-Removes the typecasting from mech fabs so they stop spitting out runtimes, at the cost of making them look even uglier.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4237 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-30 17:32:26 +00:00
baloh.matevz
31df004737 - Missed two things apparently.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4236 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-30 16:31:00 +00:00
baloh.matevz
1873aa6607 - Categorized invisibility stuff into #defines. If any errors appear - let me know.
- Hopefully addressed the concerns about the ultra-darkness. Night vision, mesons, thermals and material scanners now make you see through darkness. (Lighting code does not affect you)
- Ghosts get a "toggle darkness" verb, which changes their see_invisibility. When the toggle is enabled, ghosts cannot see other ghosts. This is due to invisibility.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4235 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-30 16:24:45 +00:00
Nerezza
ea9af8242e modified: code/modules/customitems/item_defines.dm
modified:   code/modules/customitems/item_spawning.dm
	modified:   icons/obj/custom_items.dmi
2012-07-30 10:15:22 -05:00
giacomand@gmail.com
605c234a60 -Added the High Tech Security Airlock's assembly sprites, thanks to WJohnston
-Added the new Mining Borg's jetpack sprite, thanks to WJohnston.
-Sorted the observer list for mobs.
-Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4233 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-30 11:32:42 +00:00
baloh.matevz
c6a445e73d - Added recursive explosions to code. They are not live yet. I want coders to test them out first. From my testing and estimates, they are about twice as fast as regular explosions, despite the fact that they only have minimal optimization done to them at the moment. - Basically only the things I knew from memory.
- Added two max() things to lighting code. This should stop the negative luminosity error, which happens when large explosions happen, resulting in a large blob of permanently black space. Space will be black now, but when you go through it with a flashlight, it will actually be illuminated properly.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4232 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-30 10:25:02 +00:00
ericgfwong@hotmail.com
9df6e10d74 -Moved the comms relays on mining into its own room
-Reduced the number of cameras on mining station
-Reduced the amount of r-walls on mining station
-Merged a bunch of areas in mining station /area/s. It really didn't need an APC for every closet-sized room.
-Moved the tool vender from Aux Tool Storage to Primary Tool Storage

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4231 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-30 08:51:56 +00:00
Fire
daaa21eabd Flashkirby99's tajaran
Kirby's kitties are now chopped up and ready for action with their
hairstyles added to the face file. Also tidied up the south human female
chest and torso to be more consistent with both their other directions
and the male's.
2012-07-30 03:27:03 -04:00
baloh.matevz
a2d11cf5c7 - Ported some stuff from baystation 12. Mostly sprites.
- Added pajama closets which contain 2 red and 2 blue pj's with 4 pairs of white shoes - for use in medbay and crew quarters. (pj sprites by baystation 12)
- Added the cart, plasma research, engineering and robotics vending machines from baystation 12 - Mostly for the sprites.
- Added science airlocks (sprites by baystation 12), made them work with our door construction / deconstruction mechanic. (those sprites are by me~)
- Added hazard doors, sprites by baystation 12. They're reskinned firedoors.
- Added two more styles of filing cabinets, all sprites from baystation 12.
- Changed the space law book's sprite to the one baystation 12 uses.
- Added a few floor sprites from baystation 12
- Added critter crates, sprites from baystation 12
- Added some surgery sprites from baystation 12
- Added plant sprites from baystation 12

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4229 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-30 06:50:26 +00:00
Nerezza
d8dfc36ec0 Update code/game/mecha/mecha.dm 2012-07-29 23:37:20 -05:00
giacomand@gmail.com
0509b334d5 Added some sprites from WJohnston
-Added the mining borg (no jetpack yet)
-Added the high tech security airlock (no assembly for it yet)
-Added the new telecomm sprites

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4227 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-30 03:57:28 +00:00
baloh.matevz
e3b5ac4628 - Fixed the error which made coloring eggs display the text "You color the crayon rainbow." instead of "You color the egg rainbow."
- Fixed the problem of mousetraps staying armed after a mouse triggered them
- Fixed the problem which made the following text appear when runtime splats a mouse: "Runtime Runtime SPLATS the mouse."

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4225 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-30 01:56:50 +00:00
elly1989@rocketmail.com
31f33dcedb Typo-fix
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4224 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-29 22:58:48 +00:00
giacomand@gmail.com
b0d2af457e -Added the new Telecomms circuit boards.
-Made the boards researchable.
-Misc things with Telecomms

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4223 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-29 22:48:35 +00:00
CIB
35eb1a52c6 Merge pull request #1546 from Mloc/dev
Null checks, fixed cael's derp.
2012-07-29 13:18:43 -07:00
CIB
79d4c39754 Fixed cryo pressure damage 2012-07-29 23:15:42 +03:00
giacomand@gmail.com
e6f582a254 All radios now only work in their Z level. This means that the CommSat has a few more additions to work with this change. There is now a new Telecomms Machine called the Relay which allows information to travel across Z levels. It it then linked to a new machine called the Hub, which will receive information from the Relays and send it to the buses. Because every Z level needs these relays, which are linked up with Receivers/Broadcasters, every Z level will get one. There is one in the station, in the RD's office, one in Telecomms as always, one in the Ruskie station which is turned off and hidden from the HUB's linked list. The last one is in Mining but the location for it has not been decided yet.</li>
PDAs now need to be in a Z level with a functioning Relay/Comms Network in order to send messages. It will also send uncompressed (scrambled) messages like you would with the ordinary voice messages.

I've gotten rid of the "in world" check for blackboxes, when there can only be one.

You can now easily send test signals to see if Telecomms is functioning for an atom. test_telecomms()



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4222 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-29 18:25:16 +00:00
Mloc
ba370735ff NULL checks.
Signed-off-by: Mloc <colmohici@gmail.com>
2012-07-29 18:34:12 +01:00
mport2004@gmail.com
deca16626e SpaceDust should now work again.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4220 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-29 16:52:42 +00:00
mport2004@gmail.com
49adc107d5 Mulebots will once again leave visible bloody tracks on the floor when they run people over.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4219 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-29 16:33:48 +00:00
mport2004@gmail.com
910d48c0c5 Seems the adminwho thing was actually a bug, removing the config option.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4217 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-29 15:55:03 +00:00
Mloc
333f0903e8 Merge pull request #1534 from caelaislinn/master
blast doors, lockdown comp, pets
2012-07-29 08:46:18 -07:00
Jim "Apples"
af8324ec7d Merge pull request #1543 from Mloc/dev
Custom items + New cow sprite.
2012-07-29 08:37:33 -07:00
Mloc
7cc57deb17 Merge pull request #1544 from TurboCamel/master
Finish commenting out collectible crate
2012-07-29 08:37:02 -07:00
Mloc
4d240daa7e Custom items + New cow sprite.
Signed-off-by: Mloc <colmohici@gmail.com>
2012-07-29 16:32:52 +01:00
Mloc
b34aae0c05 Merge pull request #1542 from comma/master
Fix for admin rejuv
2012-07-29 08:32:05 -07:00
TurboCamel
6abb7b6e8d Finished commenting out collectible hat crate
Sorry, my previous submission left an undefined variable because the collectible hat crate *still* wasn't completely commented out. This should fix the problem.
2012-07-29 10:30:21 -05:00
comma
60f87cf538 Fix for admin rejuv breaking examine 2012-07-29 19:30:07 +04:00
Cael_Aislinn
2909b86195 this time, with the actual file
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-07-30 01:27:53 +10:00
Cael_Aislinn
c296286e52 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-30 01:26:10 +10:00
Cael_Aislinn
c913f81517 played around with pets. hid a special one in the mining base
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-07-30 01:25:06 +10:00
Albert Iordache
4f5bdc6c64 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-07-29 15:50:44 +03:00
Mloc
fe4de6ac07 Merge pull request #1537 from TurboCamel/master
Fixed bugs with power control module supply pack and collectible hat crate
2012-07-29 05:50:14 -07:00
Albert Iordache
8a340237c6 Merge branch 'master' of https://github.com/comma/Baystation12 into comma-master
Conflicts:
	code/game/objects/items/weapons/surgery_tools.dm
2012-07-29 15:49:56 +03:00
mport2004@gmail.com
a4890eaae0 Added a config option for the extended adminwho information because it is generally a bad idea to tell the players what admins are doing.
Also fixed the issue where people on the floor could buckle others in.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4216 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-29 11:09:07 +00:00
baloh.matevz
4b41009ee9 - Player polls are now displayed in a table with alternating row colors.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4215 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-29 10:57:07 +00:00
elly1989@rocketmail.com
4fcbd6e169 Removes some seriously confused code regarding transferral of minds to ghosts upon death/gibbing.
The main problem is: if a mind is transferred to a ghost, objectives that have that mind as a target will treat the ghost as the target mob. Which is clearly a problem. This should fix exploits where people could force people to win/lose objectives via ghosting, gibbing, etc.

It should also eliminate any other weird bugs like the one Nodrak fixed a while ago where pais would keep their mind....meaning they were like, a cultist pai or something and could rat antags out to its owner using the HUD.

Removed some conditions from objectives (like those pertaining to the thunderdome) as they were bait for meta. >ghost >teleport to thunderdome >antag fails the objective she completed

Resolves issue 662

Fixes a few instances of original_name becomming null (there's still loads)


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4214 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-29 09:21:57 +00:00