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
92d762c8f4
test
2016-03-07 06:54:26 -05:00
9818f97857
Merge pull request #15919 from WJohn/xeno_sprites
...
New xeno queen and praetorian sprites.
2016-03-06 19:58:43 -05:00
818ec0ce96
Merge pull request #15827 from GunHog/Hardsuit_Jetpack_Upgrade_4_Miners
...
Hardsuit Jetpack Upgrade
2016-03-06 12:52:21 -05:00
c8fe24e8f4
Merge pull request #15912 from TrustyGun/idontlikeem
...
Changes the cockroach sprite for the better
2016-03-05 13:07:43 -06:00
c1a1e36660
New xeno queen and praetorian sprites, as well as their inhands.
2016-03-04 20:52:07 -05:00
2389fd0b01
Merge pull request #15899 from phil235/ResistandGrabFixes
...
Fixes being able to resist while dead.
2016-03-04 22:14:35 -03:00
e0b4569165
Merge pull request #15895 from TehZombehz/firstfashion
...
Adds green version of the plaid skirt.
2016-03-04 21:34:42 -03:00
8102d9b142
Alters the sprite a little bit
2016-03-04 16:57:41 -05:00
b9d269c677
Increases animation speed a little
2016-03-04 09:25:24 -05:00
81e8ecab2d
Changed cockroach sprite to be better
2016-03-04 09:01:16 -05:00
ae9e56d21f
Merge pull request #15852 from KazeEspada/Cabin
...
Cabin Away Mission
2016-03-03 22:18:12 +01:00
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
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
b4c165655d
My first attempt at a commit. Adds a green version of the plaid skirt to the clothesmate. It's just a recolor.
2016-03-02 23:42:58 -06:00
eda3426633
Merge pull request #15839 from ChangelingRain/blobberguards
...
Blobbernauts now die slowly when not near the blob
2016-03-02 22:13:37 +01:00
1cb1e7bfa8
Merge pull request #15766 from GunHog/WJohnston's_How_To_Nerf_Your_Xeno
...
Xenos now suffer when the queen dies.
2016-03-02 17:34:45 +00:00
851902f52b
Merge pull request #15743 from Shadowlight213/Voidpuppy
...
Adds Void puppies
2016-03-01 21:46:42 -03:00
40d5fa71fc
Merge pull request #15835 from Impisi/PASpriteFix
...
Particle Accelerator sprite fix
2016-03-01 21:06:58 -03:00
d7da145656
Merge pull request #15800 from Sestren413/BluespaceBananas
...
Adds bluespace bananas
2016-03-01 20:52:00 -03:00
41a42922d2
Merge pull request #15709 from Malkevin/cuffsandclean
...
Cuffs and sec clean up
2016-03-01 20:28:56 -03:00
eff82be81a
Blobbernauts now die slowly when not near the blob.
...
Blobbernauts can now see their overmind's core health via their HUD.
Blobbernauts can also see their health from their HUD.
Blobbernauts are somewhat resistant to spacewind.
2016-02-29 16:41:59 -05:00
8a592b4f39
MERGE CONFLICTS SUCK
...
Stupid Bolas
2016-02-29 11:28:49 -06:00
96e88f4fb0
Fixes Particle Accelerator sprite bug
2016-02-29 03:53:53 -08:00
897aecadf5
Merge pull request #15780 from PKPenguin321/bolas
...
Adds bolas
2016-02-29 15:01:42 +11:00
32bf31f3a0
Merge pull request #15707 from Core0verload/breathing_implant
...
[Ready] New cyberimplant: breathing tube
2016-02-29 14:53:42 +11:00
67b0bda45a
Hardsuit Jetpack Upgrade
...
Replaces the mining jetpack with the hardsuit jetpack upgrade.
2016-02-28 18:37:27 -06:00
f1d903dadb
Add fireplace and a map generator. Finishes more the cabin map.
2016-02-28 14:18:08 -07:00
101547b282
Merge pull request #15781 from ChangelingRain/blobmaster
...
Adds five new blob chemicals again
2016-02-28 17:16:04 +01:00
6002f1467a
Adds blobbernaut production animation.
...
Spores now fly properly(and zombies don't)
Added Adaptive Nexuses, which does medium brute damage and kills unconscious targets, reaping points for the overmind.
2016-02-27 22:00:49 -05:00
6dcee360e9
Merge pull request #15725 from AnturK/wroom
...
Adds simple space vehicle
2016-02-27 19:30:51 -05:00
540a6e8ed6
Space cats have a full set of sprites. Player controlled cats can now properly lie down.
2016-02-27 19:00:47 -05:00
3b4616157f
Added code and icons for bluespace bananas
2016-02-27 15:45:04 -06:00
5223bd3230
Merge pull request #15768 from Core0verload/action_fix
...
Action button icon fix
2016-02-27 01:09:56 -06:00
cfbd3ab40f
Merge pull request #15677 from Cheridan/office_space
...
Paper Cutters
2016-02-27 00:40:04 -06:00
d51a1907f8
Merge pull request #15750 from Steelpoint/M90
...
C20r Buff | M90 Removal
2016-02-27 00:22:01 -06:00
d9a214e931
adds bolas
...
adds the item itself and a hand-crafting method to handcuffs.dm
adds a tablecrafting recipe to recipes.dm
adds the sprite to items.dmi
2016-02-26 17:59:55 -08:00
d80756ce9e
Merge pull request #15745 from KazeEspada/TreeCutting
...
Tree cutting
2016-02-26 08:40:29 -06:00
f0e32522b9
Action buttons "on" generalisation
2016-02-26 07:34:23 +03:00
379eb3c04f
Queen death vulnerability
...
- The alien queen's death will now severely weaken the remaining alien
forces.
- Disables Hivemind and Evolving for 4 minutes.
- Confuses and cripples aliens for a short while.
- New screen alert to serve as a reminder! Sprite by WJohn!
2016-02-25 21:13:27 -06:00
b071108014
Action button fix
2016-02-26 05:53:37 +03:00
6c9be9c82d
Adds breathing tube implant, changes how heart works, reworks arm-mounted implants
2016-02-25 12:50:45 +03:00
628be2f67d
C20rChange
2016-02-25 15:54:37 +08:00
8aeb2678e0
You can now cut down trees! You can use anything sharp to do so, and it will produce 10 logs. The more force the item has, the faster it cuts.
2016-02-24 23:15:19 -07:00
45065339d4
Adds rare children and void puppies to corgis
2016-02-24 20:43:56 -08:00
26731ee94e
Merge pull request #15519 from PKPenguin321/sharpened-bikehorn
...
Adds sharpening blocks
2016-02-24 19:49:40 -06:00
ba85dc0266
Or alternatively we could not be lazy cunts and take the five seconds it takes to press the flip sprite button twice.
2016-02-24 21:46:08 +00:00
444b5ae9d5
Adds simple space vehicle
2016-02-24 14:14:20 +01:00
abf466e9bc
Merge conflict fixes, Uses newly refactor actions, All cursed hearts can now be inserted by hand, not just wizard ones. Fixes organ actions trying to be granted to the object, not the user.
...
Merge branch 'master' of https://github.com/tgstation/-tg-station into cursed_heart
Conflicts:
code/modules/surgery/organs/organ_internal.dm
2016-02-24 02:33:22 +00:00
57203430fd
Merge branch 'master' of https://github.com/tgstation/-tg-station into ActionButtonUpdateRefactor
...
Conflicts:
code/modules/clothing/clothing.dm
code/modules/mob/living/carbon/inventory.dm
code/modules/mob/living/carbon/life.dm
icons/mob/actions.dmi
2016-02-23 19:49:38 +01:00
bgobandit
Joan Lung
Cheridan
WJohn
tkdrg
TrustyGun
AnturK
KazeEspada
phil235
TehZombehz
Remie Richards
GunHog
Impisi
Jordie
Sestren413
duncathan salt
PKPenguin321
c0
Steelpoint
Shadowlight213
Malkevin
AnturK
phil235