Commit Graph

4046 Commits

Author SHA1 Message Date
Incoming
26a1bb65f2 Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3
Conflicts:
	code/modules/mob/death.dm
	code/modules/mob/living/carbon/alien/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/silicon/death.dm
	code/modules/mob/living/silicon/robot/death.dm
2013-12-27 00:55:44 -05:00
ACCount
15ef414627 Viral fix
Fixed strain_data, removed some unused code.
2013-12-27 17:43:26 +12: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
Razharas
2da05cf743 Merge branch 'master' of https://github.com/tgstation/-tg-station into MachinesOverhaulANdR&D 2013-12-25 02:17:24 +04: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
Rumia29
7dcc92214c Adds an alt RD uniform to the code 2013-12-23 20:52:41 -05: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
Razharas
908f28dab6 More machinery and type path fixes
Not parts are in null and not in machinery
2013-12-23 22:30:38 +04:00
Razharas
d8a6cd530f Quick paths fix post haste
Coderbus make me do this
2013-12-23 22:00:43 +04: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
Razharas
4f8389ec0e Constructable machines will depend on R&D parts
DNA scanner:
Laser quality lessens the irradiation
Manipulator quality drastically improves the precision(9 times with best
part)
Scanner quality allows to scan suiciders/ling husks, best part enables
cloner's autoprocess button, making it scan people in the scanner
automatically
Clone pod:
Manipulator quality improves the speed of cloning
Scanning module quality affects with how much health people will be
ejected, will they get negative mutation/no mutations/clean of all
mutations/random good mutation, at best quality will enable clone
console's autoprocess button and will try to clone all the dead people
in records automatically, together with best DNA scanner parts cloning
console will be able to work in full automatic regime autoscanning
people and autocloning them
Borg recharger:
Capacitors' quality and powercell max charge affect the speed at which
borgs recharge
Manipulator quality allows borg to be slowly repaired while inside the
recharges, best manipulator allows even fire damage to be slowly
repaired
Portable power generators:
Capacitors' quality produce more power
Better lasers consume less fuel and reduce heat production
PACMAN with best parts can keep whole station powered with about sheet
of plamsa per minute(approximately, wasnt potent enough to test)
Protolathe:
Manipulators quality affects the cost of things(they will also have less
m_amt and g_amt to prevent production of infinity metal), best
manipulators reduces the cost 5 times (!)
Imprinter:
Manipulator quality affects the cost, best manipulator reduce cost(acid
insluded) 4 times, i.e. 20 boards per 100 units of acid
Destructive analyzer:
Better parts allow items with less reliability in
Redone how reliability is handled, you now see item reliability in the
deconstruction menu and deconstructing items that has same or one point
less research type level will rise the reliability of all known designs
that has one or more research type requarements as the deconstructed
item
Designs of the same type raise in reliability more
Removed reliability_base and reliability_mod completely because they
served no purpose
Critically broken things rise reliability of the design drastically
Whole reliability system is not used a lot but now at least on the R&D
part it finally matters
Didnt touch telecomms machinery, R&D code is messy but tcomms is just
another level, im not high enough to touch it yet
Most of things except for pacman are tested ingame, no bugs/runtimes
detected
2013-12-23 21:39:27 +04: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
a47342d68b Fix for the disposals fix. 2013-12-22 21:24:16 +01:00
Miauw
0338a66c2a Adds fingerprints to a bunch of stuff. De-texts computer build paths. 2013-12-22 18:57:33 +01:00
Miauw
773372fc1c Fixed #1101 Disposals will no longer create invisible floor tiles. 2013-12-22 17:16:27 +01:00
Miauw
9e40407906 Merge branch 'master' of https://github.com/tgstation/-tg-station into condimentpacks
Conflicts:
	code/modules/reagents/reagent_containers/food/condiment.dm
2013-12-22 15:19:23 +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
Incoming
2b827e3592 Bugfix: Slimes that reproduce will now properly inherit magic spells 2013-12-21 02:08:21 -05: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
Incoming
a73721f7a1 Fixes for Gia:
Fixes the mysteries of reviving simple animals in the least intrusive manner I could think of
Removes player_controlled because ckeys did much the same thing
Uses update_canmove() instead of hardseting it

One last Bugfix: Simple animals generated with no real_name will use their initial name as their real name so that transformed antags will not get a "(survived as )" because the thing they turned into didn't have a real_name set.
2013-12-19 21:49:15 -05: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
Incoming
689aecc336 I forgot how children work guys
Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3
2013-12-19 15:07:59 -05: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