Commit Graph

688 Commits

Author SHA1 Message Date
Ren Erthilo 7cb6114eff TG: Steel renamed to plasteel.
Having more than 100 burn damage and being dead now makes you a husk. r2925
Author: 	 uporotiy
2012-04-09 17:15:57 +01:00
Ren Erthilo 4a39151e9e TG: Renamed the prisoner computer's file to prisoner and added a sanity check.
The singularity is now able to eat things like signs and chameleon projectors'
projections.
A few other misc runtime fixes. r2916
2012-04-09 13:28:45 +01:00
Ren Erthilo 61cc933a38 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-04-08 08:06:03 +01:00
Travis Whitehead fa1b9855d3 Added game kit to crew quarters + Fixed genetics inner shutters 2012-04-08 09:22:14 +03:00
Ren Erthilo 36991d7644 Adds a variety of cool belt bags. Fixes chemist jumpsuit world icon. 2012-04-07 19:46:49 +01:00
Ren Erthilo d52701ee84 Adds objects: office chairs, feathery pen, glass and normal research airlocks, showers, styrofoam cups. Adds clothes: Fez, cheerleader outfits, captain mal uniform, hazmat suits, wedding dress, AI bliss icon. New icons for captain, head of security, security, and warden's lockers. 2012-04-07 09:58:54 +01:00
Albert Iordache e285612c4f Moved the age var from humans to /mob/living 2012-04-07 00:24:53 +03:00
Ren Erthilo af9a80cce4 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates
Conflicts:
	code/modules/mob/mob_defines.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/storage.dmi
	maps/tgstation.2.0.8.dmm
2012-04-02 00:37:54 +01:00
Ren Erthilo 4c8d454a45 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-03-30 23:58:50 +01:00
Ren Erthilo 477ec2b394 Edited storage books and bibles to be more like boxes. 2012-03-30 16:52:14 +01:00
Ren Erthilo ae57f8db64 Merging SkyMarshal's stuff. 2012-03-30 16:26:04 +01:00
Ren Erthilo 7cf7c7775a Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates 2012-03-30 06:18:37 +01:00
Ren Erthilo aba0e9d8f6 Adds advanced medical kit sprites and uses. Will be in-game later. Also fixes security rig inhands. 2012-03-30 05:47:38 +01:00
SkyMarshal 08a060501b Merged in Erthilo's stuff. 2012-03-29 21:11:17 -07:00
SkyMarshal b24d17ddeb Fixed a small error. 2012-03-29 21:00:06 -07:00
SkyMarshal 61820bc5ec Final commit of the examine/damage overhaul. 2012-03-29 20:44:10 -07:00
SkyMarshal 01d2d5f339 WIP bloodloss and scaring system. 2012-03-29 20:42:08 -07:00
Ren Erthilo 6952bef874 Reverting disabilities, headsets, murder sydie pack, photo removal, isbreathing and internals. 2012-03-30 04:19:22 +01:00
Ren Erthilo 63c027aca9 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates 2012-03-29 08:37:47 +01:00
SkyMarshal 736c3f46e1 Final commit of the examine/damage overhaul. 2012-03-28 22:37:08 -07:00
Ren Erthilo 78b9e9928a Reverts descriptions/names and old syndicate uplink. Adds sprites for advanced medical items. 2012-03-28 22:52:00 +01:00
Ren Erthilo da7244abda Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-03-28 22:25:07 +01:00
Pobiega 3f07ef38b3 Added surgery crate to QM. Contains all surgery tools and requires access_medical to open. 2012-03-28 18:28:39 +02:00
Ren Erthilo 7aa0227ef8 Another small merge fix. 2012-03-26 18:47:25 +01:00
Ren Erthilo f7e8bcd591 TG: Emitters emp_act now uses severity properly.
The PA can no longer be remotely controlled by humans and cyborgs can only
control it if they are nearby.
The spawn PA can now be taken apart.
FireAx/Extinguisher closets got their own files.
Food closets are now with their defines.
Freezer closet/crates override return_air() to cooldown the contents.
The var isinfreezer has been eliminated.
The old player panel has been readded as an alt for the new one, it may be found
under the Player Panel verb.
The new player panel may be accessed by the Player Panel-New verb.
Crates.dm moved from the storage folder as it is not a storage object.
Fixed  Issue 227  about the PA shooting when it should not be. r2851
2012-03-26 18:46:08 +01:00
Ren Erthilo 09af032b9e TG: - Fixed wrong paths for mech circuit boards
- Added Odysseus circuit boards to designs.
- Tweaked Odysseus parts construction costs. r2814
2012-03-26 18:06:54 +01:00
Ren Erthilo 470d767369 Reverting registered_name change. Reverting area name changes. Reverts Plasma Steel and object changes. 2012-03-26 15:47:39 +01:00
SkyMarshal d65a912c8e WIP bloodloss and scaring system. 2012-03-25 20:45:00 -07:00
Ren Erthilo 089e844be9 A large amount of groundwork for /tg/ code. Comes with some gameplay changes.
* + You now take severe brute damage in environments over 750kPA. A new HUD icon warns you when it's above 500kPA. Space suits block this.
* > Welding fuel tanks explode when shot.
* > Riot shields prevent you from being pushed.
* > People cannot be shoved when being pulled and handcuffed.
* > The internals button on the hud now works for tanks in almost any area, such as your pocket.
* > No more popups when you insert your ID into your PDA. There's a link in the PDA menu to update info.
* - Removed photo system from ID's as it doesn't work.
2012-03-26 03:16:01 +01:00
SkyMarshal 5c0ddb031d Merge pull request #738 from Erthilo/master
Adds alternate CMO labcoat, engineering crates need proper access, test code for implant only taser firing, changes to overdose, and more bugfixes
2012-03-24 18:04:03 -07:00
SkyMarshal f45aff1bae Chameleon Jumpsuit now has armor, space tiles now get generated faster, fixed fingerprint runtime, optimized autosay, fixed crates + package wrappers, retired admins are no longer spammed, can now click through blindness, packages and evidence bag contents now count toward traitor objectives, stunning and such stops you instantly, guncode improvements. 2012-03-24 17:21:31 -07:00
Ren Erthilo 97f94187ff Made engineering crates engineering only. 2012-03-24 01:45:20 +00:00
Mloc 749b412093 Merge pull request #726 from CIB/master
Alcohol fixes, also more, see commit messages
2012-03-22 05:15:51 -07:00
cib 5a563b4af7 Nerfed the energy sword since it'd do 140 damage. 2012-03-21 20:56:34 -08:00
cib 42e21b3447 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-21 20:10:26 -08:00
cib f041bc7063 Rebalance of the melee damage system.
- Heavy objects now take longer to swing and deal more damage.
- A hit to the head is more likely to knock you out.
- A hit to the torso with a heavy object is more likely to knock you down.
2012-03-21 20:10:13 -08:00
cib a1f4738a67 Fix to toolbox swinging. 2012-03-21 17:46:07 -08:00
CIB bd745b5e30 Merge pull request #725 from Erthilo/master
New Engineering Space Suits, health analysers detect bone fractures, pulling lying down people is slower, and some fixes
2012-03-21 13:00:31 -07:00
Ren Erthilo fd338632c5 Fix for machine messages. Fix for previous health analyser commit. Added New Engineering Space Suits. Prevented wasting resources while fixing cyborgs. 2012-03-21 19:30:48 +00:00
CIB 1dd17e60a3 Merge pull request #727 from SkyMarshal/Airlocks
Made appendicitis only happen once, jump to explosion link should work, hallucination improvement/sanchecking, increased the damage of things to pre-nerf levels.
2012-03-21 10:02:27 -07:00
SkyMarshal b86cd6bda4 MAde appendicitis only happen once, jump to explosion link should work, hallucination improvement/sanchecking, increased the damage of things to pre-nerf levels. 2012-03-21 09:46:42 -07:00
Ren Erthilo 8ab66b0852 Made it possible to get rid of ash. 2012-03-21 02:20:27 +00:00
Ren Erthilo db134c759d Merge commit 'stash' 2012-03-20 17:31:49 +00:00
Ren Erthilo e90493c41b On master: Change 01 2012-03-20 17:31:10 +00:00
cib 1c5d305bc6 Fixes to the toolbox and APC commits. 2012-03-20 04:40:54 -08:00
cib a541d32381 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-20 03:53:46 -08:00
cib 6d979ae17b Toolboxes have a chance to swing open. 2012-03-20 03:53:12 -08:00
misterfox 64f50d0d04 Tajara stuff 2012-03-16 12:20:42 -04:00
Ren Erthilo 58b9b6595b Increased most vending machine points. 2012-03-15 22:02:37 +00:00
Ren Erthilo 61a82b22bb Fix for labeling virus dishes. Removed health analyzer from first-aid kit.
Made bruise packs and ointment only work above 50 health.
Added advanced treatment for future use.
Made MD's and CMO spawn with health analyzers.
Reduced medical equipment in non-medbay areas.
Made Health Scanner HUDs displays more granular.
2012-03-15 21:46:11 +00:00