Commit Graph

3871 Commits

Author SHA1 Message Date
rymd dc92b7d1cb Fixed destructive analyzer failure messages. 2013-12-28 14:13:30 +00:00
Cheridan 22060e18d4 Merge pull request #2133 from Giacom/labor_tweaks
Labor Camp Tweaks #2
2013-12-27 22:15:51 -08:00
Cheridan 7c2fbba76f Merge pull request #2111 from Perakp/voiceChangerFix
Voicechanger fix
2013-12-26 22:06:38 -08:00
Cheridan f36a7d764c Merge pull request #2110 from Perakp/mimeSpells
Changes mime abilities into spells
2013-12-26 20:56:40 -08:00
Cheridan 4f144e0111 Merge pull request #2130 from Giacom/gib_refactor
Refactored gib() and dust()
2013-12-26 20:34:50 -08:00
Cheridan 1f3eb1de27 Merge pull request #2124 from Miauw62/shootforthestars
Fingerprints, span classes and text path fixes.
2013-12-26 19:42:05 -08:00
Cheridan 5d715da882 Merge pull request #2113 from Giacom/can_inject
[MAP] Syringe gun projectiles will now display a message when the shots are deflected by the THICKMATERIAL flag.
2013-12-24 00:27:21 -08:00
Giacomand 02a1e9bd0f * Increased the amount of iron that spawns in the labor camp.
* Decreased the amount of points you get from diamond and bananium. Increased the amount of points you get from Iron and alloys.
 * You can now see which minerals give you which points from the claiming console.
2013-12-23 22:26:36 +00:00
Giacomand 375b9f08ea Fixes the flags of the beret. 2013-12-23 21:58:20 +00:00
Giacomand 173e1cb391 * Refactored gib() and dust()
* Refactored ex_act(), for mobs, a little.
* Removed the code which gibbed dead bodies with any severity.
2013-12-23 17:56:58 +00:00
Giacomand 28be6cfe98 * Fixes #2115 and the captain's space suit path was changed to /obj/item/clothing/suit/space/captain from /obj/item/clothing/suit/armor/captain
* Updated the map with the new path.
2013-12-23 13:41:50 +00:00
Giacom 38e0ae8848 Merge pull request #2019 from Jordie0608/Dogmas
Added reindeer hats
2013-12-23 04:18:42 -08:00
Miauw 0338a66c2a Adds fingerprints to a bunch of stuff. De-texts computer build paths. 2013-12-22 18:57:33 +01:00
Giacomand c39f61fe27 * Syringe gun projectiles will now display a message when the shots are deflected by the THICKMATERIAL flag.
* Fixes the space helmet not having the flag.
 * Fixes various coverall armour not having the THICKMATERIAL flag.
2013-12-22 01:43:03 +00:00
Aranclanos 58d0ed5221 Merge pull request #2094 from RobRichards1997/19/12/2013-Sec-see-Sec-Sprites
Security Sprite updates.
2013-12-21 15:24:14 -08:00
Aranclanos 40929b37d3 Merge pull request #2093 from Giacom/small_fixes_and_tweaks
Small Tweaks and Fixes
2013-12-21 15:12:01 -08:00
Aranclanos f00c80bd43 Merge pull request #2104 from Giacom/gulag_therevenge
[MAP] The Gulag: The Revenge: Part 2.5
2013-12-21 15:05:57 -08:00
Aranclanos e7579e2aa8 Merge pull request #1986 from Perakp/janitorCartFix
Fixes janiborg interaction with janicarts
2013-12-21 15:01:37 -08:00
Giacom b12f996512 Merge pull request #2106 from Bobylein/labcoats
Allows Labcoats to store Bottles, Beakers, Pills, Pill Bottles and Paper...
2013-12-21 13:58:13 -08:00
Giacom 5fb0d05dd1 Merge pull request #2096 from Aranclanos/SweetLindaNobodyWillTouchYou
Small fixes for Linda.
2013-12-21 13:57:15 -08:00
Giacom 24676cb23c Merge pull request #2091 from Razharas/ChemDesp
Fixes chem dispenser properly
2013-12-21 13:56:04 -08:00
Giacom 9d24a900ae Merge pull request #2066 from Perakp/slipFix4
No slipping when lying down
2013-12-21 13:54:39 -08:00
Giacom bcfcb3a9cf Merge pull request #2073 from Jordie0608/ShakeTheRoom
Gibbing borgs explode violently
2013-12-21 13:42:59 -08:00
Giacom 16cb706b79 Merge pull request #2062 from Aranclanos/RnDConsole
RnD console runtimes fix.
2013-12-21 13:38:32 -08:00
Perakp b1996a77e1 Fixes AI seeing the name of the person who speaks over radio using a voice changer. 2013-12-21 23:01:52 +02:00
Perakp 0d1ba1eccf Changes mime abilities into spells. Admins can now give these from the 'give spell' menu. Unlike previous mime abilities, these are not transferred when a mime is cloned. 2013-12-21 20:54:07 +02:00
Perakp 65e0931d55 Merge branch 'master' into janitorCartFix
Conflicts:
	code/game/objects/items/weapons/storage/storage.dm
2013-12-21 09:40:06 +02:00
Bobylein fe0e995959 Allows Labcoats to store Bottles, Beakers, Pills, Pill Bottles and Papers in their suit slot. 2013-12-21 07:47:47 +01:00
Giacomand 47545f439e * Added ore boxes to the gulag, and added a conveyor belt which goes outside and has a loading machine, which will take the ore from the orebox.
* Added sprites for the stacking machine going in the reverse direction, just set the dir to 1 instead of 2.
 * Added prison intercoms which will not broadcast until someone hacks it. Added these intercoms in the gulag, the perma brig and the brig cells.
 * When a prisoner has received enough points for freedom, if they try to move the shuttle, or open the middle door, while someone is on it they will get an error message. This way there is no way for a free'd prisoner to release their fellow prisoners once they have reached their point target. The shuttle will depart right away when you call the shuttle from the stacking console, to stop prisoners from getting on while it departs.
2013-12-20 22:09:06 +00:00
Cheridan 046714d864 Merge pull request #2092 from Giacom/grab_monkey
Monkeys no longer wander off when being pulled or grabbed.
2013-12-20 11:44:25 -08:00
Cheridan a03c5ba388 Merge pull request #2081 from Razharas/brakes
Fixes trunks being unwelded while under machinery
2013-12-19 22:31:32 -08:00
Cheridan e44e31f8c9 Merge pull request #2077 from Razharas/fix
Fixes soil being wrenchable
2013-12-19 22:05:47 -08:00
Aranclanos 213f3fff31 Some fixes for Linda, now the Move() proc of objects that block air is different. Example below.
object/Move()
   var/turf/T = loc
   ..()
   move_update_air(T)
2013-12-19 22:13:21 -03:00
Robson Richards f8c05e2169 Security Sprite updates.
Replaces all instances of the old Swat and riot sprites with Validsalad's new ones
Replaces Sechailer's with Officer, Warden and HoS versions code and Sprites wise (Sptires by Validsalad again)
The officer gas mask is gas/sechailer, the warden's is gas/sechailer/warden and the HoS's is gas/sechailer/hos
2013-12-19 23:14:51 +00:00
Giacomand 80f2076bcc * Fixed the party alarm from only working in areas with a certain light level.
* Reduced a lot of duplicated code in the party alarm.

* Added a shield range variable for the anti-breach shield generators.
* Changed the shield range to 4, making them more useful.
* Fixed a bug with the deployed_shields list not being cleared after the shields are down.

* Fixed a runtime with shake_camera()
2013-12-19 22:07:52 +00:00
Aranclanos 0fdcd42592 Merge pull request #2054 from Cheridan/Nuke
Nuke Ops Tweaks: Flamer and Mechas
2013-12-19 13:37:32 -08:00
Giacomand c917999f2f * Monkeys no longer wonder off when being pulled or grabbed.
* Fixed the grabbed_by list not being emptied when the grab is deleted.
 * Removed duplicated use of grabbed_by.
 * Undef'd defines which are only used in a single file.
2013-12-19 20:41:19 +00:00
Razharas 5e3997e0e2 Fixes chem dispenser properly
Fixed #2051
2013-12-20 00:30:35 +04:00
Cheridan fbe24b46ac Merge pull request #2071 from Giacom/viro_streamline
Virology Feedback Tweaks
2013-12-19 10:51:08 -08:00
Cheridan 8ba3859b2d Merge pull request #2069 from Aranclanos/pAIBioscan
pAI bioscan runtime fix
2013-12-19 10:41:07 -08:00
Jordie0608 33a315a111 Switched position with gib 2013-12-19 12:48:14 +11:00
Razharas 1a2553dc33 This wasnt supposed to be deleted 2013-12-19 00:46:10 +04:00
Razharas 691ea75b45 Fixes trunks being unwelded while under machinery 2013-12-19 00:38:14 +04:00
Perakp 2f70aaadb3 Removes magic numbers and an useless check
- it shouldn’t runtime.
2013-12-18 22:31:07 +02:00
Razharas 5f459cd834 Fixes soil being wrenchable 2013-12-19 00:08:48 +04:00
Perakp 68ff764463 Subtypes of janiborg tools
- The other way of fixing it. I’m not sure why this is better.
- Removed condescending messages to cyborgs.
2013-12-18 20:44:24 +02:00
Jordie0608 8da1ab8641 Gibbing borgs explode violently. 2013-12-19 05:31:15 +11:00
Giacomand 44895bf36f Merge branch 'master' of https://github.com/tgstation/-tg-station into tinypricknomore_andgunstuff
Resolved Conflicts:
	code/modules/projectiles/projectile.dm
2013-12-18 18:27:22 +00:00
Giacom 90972ba593 Merge pull request #2052 from Aranclanos/PhotocopierCooldown
Photocopier runtimes fix.
2013-12-18 10:12:03 -08:00
Giacom 0c03873d03 Merge pull request #2053 from Aranclanos/NOBODYLIKESNINJAS
Ninja mask runtimes fix.
2013-12-18 10:10:26 -08:00