Commit Graph

1541 Commits

Author SHA1 Message Date
CIB
9fa25a84ce Merge pull request #1563 from FireFishie/belts
Added some belt storage options
2012-08-03 14:06:13 -07:00
FireFishie
a13e620abe Added some belt storage options
-Medical, security, and tool-belts may now hold any type of lighter
-Medical belts may now hold latex gloves and sterile masks
-Security belts may now hold gas masks
-Tool-belts may now hold cigarette packs
2012-08-02 15:26:24 -04:00
Cael_Aislinn
7ae269f38f some tweaks to mice and roaches, tried to get the gameticker to periodically spawn them but failed (will come back to)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-02 04:56:48 +10:00
Cael_Aislinn
469a8bb601 ported over the majority of /tg's simple_animal code and changed a lot of things for simple_animals and critters
- added bears, mice (cats will chase mice, mice squeak occasionally)
- removed some unique simple_animals (ian and runtime will be the only ones for now)
- structure improvements, tweaks and cleanup for simple_animals and critters
- space carp should work fine now
2012-08-02 03:22:44 +10:00
CIB
e9937050aa Merge pull request #1558 from FireFishie/closets
Some minor changes, mostly related to wardrobes and fluff text
2012-08-01 00:23:05 -07: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
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
Nerezza
b6d6dc2574 modified: code/game/jobs/job/engineering.dm
modified:   code/game/objects/closets/wardrobe.dm
2012-07-30 13:09:52 -05:00
Albert Iordache
4f5bdc6c64 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-07-29 15:50:44 +03: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
comma
b2522daa5d Surgery bugs.
Stopped attacking patient during head surgery with hemostat.
Was caused by try_bone_surgery called twice in code.
Removed one redunant call.

Fixed runtimes during face surgery.
Null organ was caused by not being 'mouth' organ there.
Made it select 'head' as affected organ.
2012-07-29 08:21:37 +04:00
TurboCamel
005b5ec1e5 Added new circuit boxes
Added power control module box and airlock electronics box.
2012-07-28 16:37:17 -05:00
Head
f814d99249 Added condition to the rest of the code in effect_system.dm 2012-07-28 17:53:13 +02:00
Head
04fac7a528 Fix for the fix!, God i hate byond code. 2012-07-28 17:46:25 +02:00
Head
3a1f30ece4 A few fixes. 2012-07-28 17:16:22 +02:00
Albert Iordache
6b2a3531df Moved magboots from fire closets to atmos wardrobes 2012-07-25 21:26:56 +03:00
Albert Iordache
836e32b5d8 Merge pull request #1517 from Nerezza/atmosmags
Giving atmos techs magboots for ZAS immunity.
2012-07-25 04:53:08 -07:00
Nerezza
01e18f821a modified: code/game/objects/closets/firecloset.dm 2012-07-25 03:30:53 -05:00
Cael_Aislinn
4f3374cdaf compile fix
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-07-21 20:54:31 +10:00
Cael_Aislinn
779ca913f4 death alarm implants no longer announce deaths on syndicate shuttles
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-07-21 20:51:11 +10:00
Albert Iordache
8b976b3279 Debug message 2012-07-15 12:29:02 +03:00
Albert Iordache
b94b57e04c Partially fixed the double definition of BROKEN, renamed organ definitions 2012-07-13 23:42:05 +03:00
Albert Iordache
dda09390ac Merging pull request from caelaislinn-master 2012-07-13 20:54:22 +03:00
Albert Iordache
d931bb9ad7 Removed X button from PDAs. 2012-07-11 13:18:36 +03:00
Albert Iordache
a2ef50ed29 Fixed bug where helmet lights would not turn off when placed in backpacks and updated changelog 2012-07-10 22:14:08 +03:00
Albert Iordache
d47b71b7c8 Added cancel button to teleport dialog, close button to PDA window and cancel button to telepathic mind projection 2012-07-10 16:31:19 +03:00
Albert Iordache
a3ea5fb087 Fixed a bug where rig helmet lights would not turn off and a bug with door assembly icons. 2012-07-08 19:25:10 +03:00
cib
674042aa35 Cauterizing amputated limbs should now stop the pain. 2012-07-07 13:00:29 +02:00
cib
bce2e2a66a Removed redundant wire object. 2012-07-07 11:17:11 +02:00
CIB
f6fe1f252e Fixed some issue with cyborg limb repair wires. 2012-07-07 11:58:52 +03:00
unknown
050b697486 Ugh, grammar 2012-07-06 15:37:05 +03:00
unknown
3d839120a4 and some more 2012-07-05 23:06:03 +03:00
unknown
46dcfb2d3d Fixes wounds not bleeding and makes gauze stop bleeding
Fixes issue #1408
2012-07-05 20:48:08 +03:00
unknown
cde6aa0e35 Fixed phantom donut bug
Fixes issues #1431 and #1183
Also fixes similar bug with SE injector and any item that gets deleted while in hand
2012-07-05 18:28:38 +03:00
unknown
507dc7cc84 Fixed surgery bleeding bug
Clampers did not clamp properly
2012-07-05 17:32:45 +03:00
unknown
7a8f5ec38e Makes ointment give different message from gauze when applied.
No more 'bandaging with ointment' (Issue #1430)
2012-07-05 15:08:12 +03:00
Erthilo
8acd06ddda Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2012-07-04 09:00:59 +01:00
unknown
b0cb325bb6 Fixed a derp 2012-06-30 14:16:04 +03:00
unknown
427d409113 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-06-30 13:43:08 +03:00
Erthilo
0e6c0cfac4 Fixed and improved body scanner, fixed derpy airlock cycling on the map. 2012-06-29 03:28:58 +01:00
Erthilo
f5b221bb63 Fixes a few places where if statements wouldn't work due to syntax errors. 2012-06-29 02:31:46 +01:00
Erthilo
95bae4da54 Fixes AI holopad speech not being picked up by tape recorders. 2012-06-28 22:33:07 +01:00
Erthilo
73e2b5f5c2 Hotfix for stun batons harming on all non-help intents. 2012-06-28 22:31:16 +01:00
Erthilo
34e4ba4750 Only chairs with wheels now work with fire extingusihers. 2012-06-28 00:01:58 +01:00
Erthilo
73ba4c7f0f Readjusted Medical items heal caps. 2012-06-27 23:36:38 +01:00
Erthilo
0c1e3f3cc4 Fixes PDA's being unusable when buckled but not handcuffed. 2012-06-27 23:36:18 +01:00
unknown
869a82a3e3 Clipboards changes
+Added 'Rename' function
+Added ability to add photos to clipboards

%Fixed linebreaks not being replaced with <br> when viewing paper from clipboard

Signed-off-by: Chinsky <comma@nano.(none)>
2012-06-27 23:12:09 +03:00
Erthilo
e65b1739be Fixes surgery in general. 2012-06-27 18:08:56 +01:00
unknown
30322cae04 Made briefcase spawn empty.
Breifcases are mostly used for storing things other than paper, and that includes tedious process of getting all this paper out somewhere.
All briefcase-wielding jobs have clipboards at their disposal for storing paper, and if they need more paper, i'ts not hard to find on station.
2012-06-27 17:37:16 +03:00