Commit Graph

24890 Commits

Author SHA1 Message Date
bgobandit
dbd01d8a43 fixed 2016-03-07 12:28:35 -05:00
bgobandit
ed67d189a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into catfixes
Conflicts:
	icons/mob/pets.dmi
2016-03-07 07:13:30 -05:00
bgobandit
128cf1e19d test 2016-03-07 07:07:34 -05:00
Remie Richards
c71de63ed5 Merge pull request #15934 from ChangelingRain/nautglow
Blobbernaut damage glow is more visible
2016-03-06 23:10:51 +00:00
Nerd Lord
9fc8fa3691 use correct flag 2016-03-06 17:59:50 -05:00
Cheridan
f68584078c Merge pull request #15916 from Menshin/gc_destroyed2qdeleted
Replaced last occurences of gc_destroyed by qdeleted()
2016-03-06 12:29:30 -06:00
Joan Lung
818ec0ce96 Merge pull request #15827 from GunHog/Hardsuit_Jetpack_Upgrade_4_Miners
Hardsuit Jetpack Upgrade
2016-03-06 12:52:21 -05:00
Cheridan
51817ef700 Merge pull request #15930 from tkdrg/runtimes
Fixes camera runtime
2016-03-06 11:16:23 -06:00
Cheridan
531940cc25 Merge pull request #15932 from Impisi/Maintloot2
Fixes MaintLoot Drop Table
2016-03-06 11:15:43 -06:00
Nerd Lord
218d456e5a naut 'damage' glow is more visible on all blob types 2016-03-05 10:59:53 -05:00
Razharas
a1d67b58c4 Merge pull request #15911 from sawu-tg/snpcupdate
SNPC Update v4: ;HELP I'M BEING BEATEN TO DEATH BY GIBBERING ROBOTS
2016-03-05 16:39:29 +03:00
Impisi
2bb60c13a3 Fixes loottable 2016-03-05 05:31:02 -08:00
Impisi
9eda2e0932 Reduces empty lootdrop slots to rebalance the table according the the original creators instructions. 2016-03-05 05:22:07 -08:00
Tkdrg
9633cae728 Fixes camera runtime 2016-03-05 08:51:48 -03:00
tkdrg
442c769eeb Merge pull request #15888 from ChangelingRain/robustin-can-never-be-satisfied
Robustin-Sponsored Blobbernaut Nerf PR
2016-03-05 08:12:29 -03:00
Sawu
430bca51d4 Merge branch 'master' of https://github.com/tgstation/-tg-station into snpcupdate
Conflicts:
	code/modules/mob/interactive.dm
2016-03-05 22:09:16 +11:00
Cheridan
5658a4d14b Merge pull request #15904 from KorPhaeron/lmao2cat
Nerfs catsplosion
2016-03-04 20:55:01 -06:00
tkdrg
96d8652ec4 Merge pull request #15885 from phil235/ReagentMobUpdateFix2
Health update from reagent metabolization now only happens once. Part 2
2016-03-04 22:18:39 -03:00
tkdrg
2389fd0b01 Merge pull request #15899 from phil235/ResistandGrabFixes
Fixes being able to resist while dead.
2016-03-04 22:14:35 -03:00
Menshin
9afe050025 Replaced last occurences of gc_destroyed by qdeleted(). 2016-03-05 01:58:56 +01:00
tkdrg
8972a07f62 Merge pull request #15898 from KorPhaeron/rpd2
Adds RPD to Chief Engineer's locker
2016-03-04 21:35:30 -03:00
tkdrg
e0b4569165 Merge pull request #15895 from TehZombehz/firstfashion
Adds green version of the plaid skirt.
2016-03-04 21:34:42 -03:00
tkdrg
829926d71d Merge pull request #15891 from Ultimate-Chimera/XenoStuff
Fixes xenomorph hiss emote sounds because I am stupid.
2016-03-04 21:34:10 -03:00
tkdrg
3585fd3e9c Merge pull request #15889 from phil235/BolaNogravThrowFix
Fixes throwing bola and embeddable items in no gravity
2016-03-04 21:33:56 -03:00
Cheridan
a7eb9f657e Merge pull request #15905 from KorPhaeron/chaplain
Holy Weapon typo fix
2016-03-04 18:08:58 -06:00
tkdrg
fd74fafb63 Merge pull request #15847 from Core0verload/cyborg_tools
New, faster tools for engineering cyborgs
2016-03-04 20:56:48 -03:00
tkdrg
e1c2f70ca3 Merge pull request #15812 from Shadowlight213/secborgremoval
Adds a config option to disable the security cyborg module.
2016-03-04 20:54:57 -03:00
Cheridan
519a517206 Merge pull request #15901 from ChangelingRain/chemfixes
Fixes and tweaks blob chemicals
2016-03-04 16:08:21 -06:00
Nerd Lord
d63dbdcb96 I guess they can be fast if it's 1 per 2016-03-04 17:07:31 -05:00
Shadowlight213
ebcbbec8e2 Reverses the config var so it forbids instead of allows 2016-03-04 10:49:00 -08:00
Joan Lung
6a79d12862 Merge pull request #15884 from RemieRichards/XenoBreathNoises
Aliens now make breathing noises
2016-03-04 12:22:45 -05:00
phil235
44eb9607e0 Some adjustments to wrapping code. I removed my possibility to wrap non-box storage item (that was at the expense of seeing a warning message that the packagewrap doesn't fit in the storage item every time you wrap one). So we're back to only wrapping boxes.
You can now wrap an item that is in your hand, and wrapping an item puts the created package in you hand.
Also, opening a package puts the item in your hand instead of being dropped on the ground.
2016-03-04 17:24:36 +01:00
Sawu
3aabb070d8 SNPC Update v4: ;HELP I'M BEING BEATEN TO DEATH BY GIBBERING ROBOTS
* Updates the CustomiseSNPC verb to be less laggy
* Adds a resetSNPC verb to manually reset one.
* Adds a toggleSNPC verb to change between high and low profile mods
* Added a "High Profile" processing mode that can allow the SNPC to tick at custom rates, for special/story SNPCs
* All SNPCs now spawn as Assistants to prevent head spam.
* SNPCs can now be spawned as a doppelganger, and will take the name of a person with the same job as them.
* SNPCs now only hack doors their job doesn't have access to.
* SNPC augmentation values tweaked
* Runtime caused by limbs fixed
* Runtime caused by assigned the SNPC to be a chef fixed.
* Bartender SNPCs now receive a module which allows them to serve drinks to nearby patrons.
* Fixed Chef SNPCs having incorrect modules and home areas.
* Certain modules will now skip being processed if combat is taking precidence.
* Fixed an incorrect emote.
* Clown SNPCs will now drop less items (to prevent massive piles of soap or bananas)
* SNPCs using the healing module will now try to use stackable healing items, and if they are out, instead use their inbuilt tricordrazine hypospray.
* Janitor SNPCs no longer attempt to mop things, and instead use an inbuilt space-cleaner spray
* Chef SNPCs will no longer leave behind uncooked food when trying to process it.
* Chef SNPCs will now use the smartfridge as a source to make custom food.
* Chef SNPCs will no longer run amok, spraying food everywhere.
* Chef SNPCs will attempt to serve up completed food to the Chef's window
* If a Chef SNPC cannot find any viable food source, they will synthesize clones of regular food, which have a lower nutriment count than the real ones.
* SNPCs will no longer explode into items when entering combat, and will no longer throw guns instead of shooting them.
2016-03-04 21:14:02 +11:00
Cheridan
1ae539e2d1 Merge pull request #15908 from Core0verload/plantrefactor1
Plant Refactor: It came from the Conflicts Hell
2016-03-04 01:02:50 -06:00
c0
f33813feda quickfix 2016-03-04 05:20:33 +03:00
c0
3c06668e0c Adds proc for checking all the plants for broken in-tray icons 2016-03-04 05:06:17 +03:00
Nerd Lord
eaf0c3443c don't code when nauseated for like a month kids 2016-03-03 19:59:58 -05:00
Nerd Lord
594322b2e6 oh wow jeez whoops 2016-03-03 19:30:38 -05:00
Nerd Lord
12d0d82cd6 Synch mesh won't split damage to cores or nodes 2016-03-03 19:17:24 -05:00
c0
a690abcf92 Plant Refactor: Seeds 2016-03-04 02:35:51 +03:00
AnturK
ae9e56d21f Merge pull request #15852 from KazeEspada/Cabin
Cabin Away Mission
2016-03-03 22:18:12 +01:00
KazeEspada
4a0fa13ed7 Forgot a file. 2016-03-03 13:50:16 -07:00
KazeEspada
6d2a95eb43 Moves the mapGenerator to mapGeneratorObj.dm.
Cabin was given new carpets, and some fixes.

The snowy map generator now spawns bunnies.

New type of bunny that is not easter related.

Chickens now have support for no eggs.
2016-03-03 13:47:11 -07:00
phil235
c76f48e817 derp 2016-03-03 21:08:19 +01:00
phil235
a330cafea5 Fixes some mistakes.
Updating the package wrap's descriptions to be accurate and useful.
2016-03-03 21:02:03 +01:00
phil235
15d8e0a96f I refactored how a mob resisting out of a closet that is itself inside something is done.
Fixes not being able to resist out of an unlocked unwelded locker. Now both moving and the resist button  work (except for the cardboard box).
You can no longer spam breakingout message ouf of a closet by moving while inside.
Wrapping and unwrapping a locker no longer unwelds it magically.
I refactored closet/crate/item package wrapping.
You can packagewrap belts and other storage items in which the package wrap item doesn't fit.(it does currently have the unintended side effect of giving you the "doesn't fit in X" message when wrapping there storage items though).
2016-03-03 20:20:34 +01:00
Shadowlight213
51c414e808 Removes the backup check. 2016-03-03 10:48:13 -08:00
Shadowlight213
510f9863dc fixes merge conflicts 2016-03-03 10:42:54 -08:00
KorPhaeron
555d55f39a Typo fix 2016-03-03 12:41:07 -06:00
KorPhaeron
daa2a3316f 2cat!! 2016-03-03 12:27:00 -06:00