818ec0ce96
Merge pull request #15827 from GunHog/Hardsuit_Jetpack_Upgrade_4_Miners
...
Hardsuit Jetpack Upgrade
2016-03-06 12:52:21 -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
ae9e56d21f
Merge pull request #15852 from KazeEspada/Cabin
...
Cabin Away Mission
2016-03-03 22:18:12 +01: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
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
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
6dcee360e9
Merge pull request #15725 from AnturK/wroom
...
Adds simple space vehicle
2016-02-27 19:30:51 -05:00
3b4616157f
Added code and icons for bluespace bananas
2016-02-27 15:45:04 -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
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
26731ee94e
Merge pull request #15519 from PKPenguin321/sharpened-bikehorn
...
Adds sharpening blocks
2016-02-24 19:49:40 -06: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
09252b4f4b
Merge pull request #15657 from KorPhaeron/abductor
...
Abductor Airlocks
2016-02-22 00:05:15 -06:00
bde19dd8d4
paper cutters
2016-02-21 19:28:05 -06:00
1263e341a3
Adds a "Cursed Heart", a heart where you have to manually pump blood or you die.
2016-02-22 01:03:53 +00:00
2ec892a1fc
Merge branch 'master' of https://github.com/tgstation/-tg-station into Holobarrier
...
Conflicts:
icons/effects/effects.dmi
2016-02-22 01:34:20 +01:00
6dd5d4ba83
Fixes looping
2016-02-21 13:29:07 -06:00
2f688f2b64
Merge pull request #15635 from KazeEspada/barfights2
...
Bar Fights 2
2016-02-21 19:36:33 +01:00
3f439b211c
Abductor Airlocks
2016-02-21 00:01:54 -06:00
9a33d27e05
Wooden chairs added. Inhands in WJohnston's pull. Fixed an issue with spawning to many sheets upon smashing.
2016-02-20 14:25:29 -07:00
83ec0ed002
Merge remote-tracking branch 'refs/remotes/tgstation/master' into techno_alchemist
...
# Conflicts:
# icons/mob/inhands/items_lefthand.dmi
# icons/mob/inhands/items_righthand.dmi
2016-02-20 14:49:30 -06:00
1a4206c77b
Merge remote-tracking branch 'upstream/master' into uhhhhh
2016-02-19 18:32:07 +00:00
8b2708ff9a
Replaces holo tape and holo tape projector with holo barrier and holo barrier projector (children of the janitor's holosign creator).
2016-02-19 02:34:57 +01:00
56d2a34201
Splits beds and chairs
...
Adds deconstruct structure helper
Moves chair sprites from objects.dmi to chairs.dmi
Fixes check shields passing proper flags on unarmed attacks
Makes stools and chairs able to be picked up
2016-02-18 17:55:38 +01:00
0d8a181ee7
Knife
2016-02-17 22:33:33 -06:00
1bee6b5365
Merge remote-tracking branch 'upstream/master' into uhhhhh
2016-02-17 15:04:51 +00:00
2f71b65fe2
fixes sprite, changes prefixes
...
double prefixes are no more. instead, it now goes sharpened, twice-sharpened, and thrice-sharpened. there should never be an item that is sharpened more than three times, which works out because there is no word that comes after thrice (thank you so much @razharas for the code for this)
a little bit of weirdness got stuck on the sprite when i first implemented it due to a goof when i removed the transparency, it is now fixed
2016-02-17 01:09:01 -08:00
51de0406f4
adds sprites, tweaks damage values
...
max is now 12, down from 15
increment per block is now 4, down from 5
sprites by @newfren
2016-02-16 17:03:48 -08:00
7d93b7d6c4
Merge pull request #15386 from Zerrien/master
...
Adds unique icons for the 2 types of patches.
2016-02-13 23:36:04 -06:00
cac7a6eddf
Sprites for APS and nagant
2016-02-13 20:11:58 +00:00
b5c79e3781
Adds military russian
...
Adds camouflage fatiges, functionally identical to turtlenecks
Adds buckshot loaded pump shotgun variant
Adds sprites for the new russian
2016-02-13 20:05:51 +00:00
c8d4d58124
Merge pull request #15424 from Firecage/humansuit
...
Makes the gibber give skins when gibbing humans. Also adds craftable human suits from human skin.
2016-02-13 10:22:34 -06:00
f471977904
Merge pull request #15425 from Zerrien/conveyorChanges
...
Buildable corner conveyor pieces and rotating built conveyor pieces using a wrench
2016-02-13 00:21:21 -03:00
e0dad3682e
Changes the brute patch colors from purple to pink
2016-02-11 21:05:47 -08:00
ff890138e4
Implements the ability to place corner conveyor pieces, and implements constructed conveyor rotation using a wrench
2016-02-11 01:18:25 -08:00
c4c37d6553
Makes the gibber give skins when gibbing humans. Also adds craftable human suits from human skin.
2016-02-11 09:59:23 +02:00
Joan Lung
tkdrg
AnturK
phil235
TehZombehz
GunHog
Impisi
Jordie
KazeEspada
Sestren413
duncathan salt
Cheridan
PKPenguin321
c0
Steelpoint
AnturK
Remie Richards
Cheridan
phil235
KorPhaeron
xxalpha
Thunder12345
Zerrien
Firecage