Commit Graph

108 Commits

Author SHA1 Message Date
MMMiracles 5b9eeb8935 Adds adorning spears with heads (#33955)
* get spiked, son

* bonespear variant

* cyberboss changes + pixel shifting

* Move 👏 overlay 👏 calls 👏 to 👏 update 👏 icon

* git yer head on a pike here, 25 cents

* ignore that .gitignore

* variable change

* changes n stuff

* may of forgotten that bit

* moved vars up + drop_location()

* null the nulls
2018-01-05 08:48:07 -08:00
kevinz000 5182128d2a refactors riding datums to a component, vehicle refactor staging for mech overhaul (#32249) 2017-12-04 10:33:01 +13:00
Kyle Spier-Swenson 8c4885cf6e Revert "Ore Stacking (#33062)"
This reverts commit 8e1ac5720d.
2017-11-28 22:56:54 -08:00
kevinz000 8e1ac5720d Ore Stacking (#33062) 2017-11-28 21:27:34 -05:00
brettdavies1995@gmail.com 7b8d1961fb Enables bolas in crafting 2017-11-19 06:59:04 +00:00
ACCount b5e074661f Refactor of catpeople mutant organs (#32101)
* Refactor of cat mutant organs

* Damage multiplier for ears
2017-11-01 21:14:34 +01:00
Mercenaryblue 9b8eae364b Honkbots Tablecrafting
You can now tablecraft Honkbots.
2017-10-31 12:26:07 -05:00
pubby 7cc4c3799a Remove stray / 2017-09-13 15:38:55 -05:00
ExcessiveUseOfCobblestone 4d0000f9df Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume! (#30553)
* king NTRhut

* Sets the tunic to exosuit

* 🙏

* pyramids not included

* Staff desc is helpful!
2017-09-10 17:08:20 -05:00
Armhulen bcbc16691b chainsaws rebalance, but working this time :) (#30399)
* buff chainsaws 2: electric boogaloo

sned help

* Revert "helps chainsaws out"

This reverts commit 2954df89e9393bb29894a29af83abe3d69f27c78.

* helps chainsaws out

i'm sorry we hurt you chainsaws

* i'm not stupid i'm misguided!

but i actually totally agree with this so !go kor!

* AH, BINGO.
2017-09-09 01:00:34 +10:00
pubby 65bb0a3e32 Ammo cleanup (#30361)
* Clean up ammo

* Fix maps

* Cyberboss ammo cleanup fixes
2017-09-07 11:02:44 -04:00
Anonmare 86e20ace67 Alters the pressure plate crafting recipe (#30452) 2017-09-06 20:35:50 -05:00
Jordan Brown fab63821f5 Fixes weaponcrafting repath 2017-08-16 12:15:08 -04:00
Jordan Brown af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
MoreRobustThanYou 899bb2a305 Ports Rapid Cable Layers from /vg/ and paradise (#29119)
Add's a tool that lays cable as you walk , speeding up cable construction

add: Nanotrasen has begun production of the Rapid Cable Layer, a tool that helps you lay down cables faster
add: You can now craft ghetto RCLs with metal, a screwdriver, welder, and wrench. They hold less cable, and may fall apart or jam!
2017-07-28 09:58:40 +12:00
ShizCalev 45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
Expletive 814d34d953 Adds the skull codpiece, an accessory that can be worn above or below an exosuit. (#28479)
* Adds the skull codpiece, an accessory that can be worn above or below an exosuit.

* woops
2017-06-23 14:33:17 -04:00
Expletive 1860e1a2ea Paper frames, but with new sprites. (#28452)
* Paper frames, take two

* With entirely new sprites

* and basemap

* no directional doors also smoothing

* changes requested

* woops

* deconstruct -> Destroy
2017-06-18 10:45:35 -04:00
Thunder12345 93a6dcb02e cats 2017-06-12 17:49:28 +01:00
Expletive 8413960d8e A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) (#28115) 2017-06-06 22:26:56 -03:00
Expletive 73d65ceb82 The Crafting Menu now has subcategories! (#27863)
* subcategories also it's broken

* It works!

* Fix pneumatic cannon recipe

* Some fixes and changes

* Reformats ui, removes redundant chat messages

* Remove comment

* while im at it
2017-06-03 19:28:14 +02:00
Goodstuff c8717940a2 Fixes black carpet recipe and sprite (#27891) 2017-06-01 10:38:24 -03:00
Expletive 9466b6f62c Maybe this time I won't fuck it all up 2017-05-30 14:10:54 -07:00
FantasticFwoosh cadc52a033 Adds goliath cloak & a recipe (Lavaland PvE primitive item) (#27537) 2017-05-26 13:14:12 -03:00
Expletive 6f88d224ec Adds a few new recipes created with plastic sheets (#27257) 2017-05-15 09:02:24 -03:00
Fox McCloud 7db6a982d7 Modular Receiver in Autolathe (#25401)
* Modular Receiver in Autolathe

* forgot this
2017-03-25 09:21:50 +13:00
XDTM 11a205f179 Fixes Pressure Plate recipe 2017-03-21 23:06:02 +01:00
XDTM 2f194043e5 Fixes recycled explosive spears (#24857)
* tentadel

* back to normal

* Fixes recycled explosive spears
2017-03-10 23:01:18 +01:00
kevinz000 4408a8fbdc [READY]Pressure plates - Idea by Arianya (#24319)
* welcome to minecraft

* all good

* fix

* forcemove

* new procs
2017-03-02 19:35:20 +13:00
KorPhaeron 6ad9b5abe1 Replaces cybernetic implants with cybernetic eyes 2017-02-03 18:47:49 -06:00
KorPhaeron 78a1902b46 Flashlight Eyes 2017-02-01 19:06:41 -06:00
Fox-McCloud d020dff714 Fixes ED-209 Crafting Recipe Cost 2016-12-13 09:11:31 -05:00
Mervill de5470289f these commas (#22075) 2016-12-11 19:50:48 +13:00
KorPhaeron fa3d8e086c Adds strobe shields 2016-12-08 01:05:22 -06:00
phil235 b7efc2cef4 Make energy guns able to use burst fire. (#21005)
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
2016-11-02 16:16:21 +13:00
TehZombehz cbb527fcec Adds Juiceboxes/Cartons + Apple juice & Choc. Milk (#21206)
* Adds Juiceboxes/Cartons

Adds craftable small cartons and juiceboxes.

* Housekeeping

Thanks, goof.

* Acting upon suggestions

Reduce cost of crafting from 2 to 1 sheet of cardboard, reduced volume
of small cartons from 25 to 15. +Housekeeping

* New Sprites + Fixes

Adds distinct grape, orange, and chocolate milk juice box colors (from
Nienhaus). Adds chocolate milk. Changes standard chocolate recipe to
compensate for chocolate milk change (soy milk chocolate bar recipe
remains the same). Fixes being unable to juice grapes in reagent
grinders.
2016-10-29 18:13:32 +13:00
chowdermcarthor c7e474ccae Neck Slots (#21169)
* Added in a neckslot. Moved some tie items over to said neckslot.

* Changng some stuff to fix the new neckslot items.

* no message

* Altered comment to say that the old tie system is being kept as-is due to armbands and such instead of just avoiding conflicts.

* no message

* Changed the number for this.

* Fixed jaws of life not having a category, thus they only would show up when searched.
2016-10-26 19:03:41 +13:00
phil235 443a4501ec Carbon Dismemberment , second attempt. (#20461)
* - I rearranged X_defense.dm mob files, more damage_procs.dm.Here's what's inside:
* X_defense.dm: is for the procs of attacks onto the mob, all the XXX_act() proc (things happening to the mob), as well as protection check and get procs (armor, ear prot, projectile dismemberment)
* damage_procs.dm: actual damage procs like adjustBruteLoss() getfireloss, any proc that handles damaging.

- some bugfixes with gibspawner effects.
- monkey's bodyparts can be dismembered and are used to create its icon.
- brains are no longer carbons.
- all carbon have bodyparts that can be dropped when the mob is gibbed.
- adminspawned bodyparts now have a default icon.
- robotic parts are now a child of bodyparts.
- health analyzer on alien/monkey shows damage on each limb
- added admin option to add/remove bodyparts for all carbon (instead of just remove on humans)
- Fixes keycheck message spam for janicart and all when trying to move.
- Fixes bug with buckling to a scooter while limbless.
- removed arg "hit_zone" in proj's on_hit() because we can already use the def_zone var (where hit_zone got its value)
- Fixes mob not getting any damage when hit by a projectile on their missing limb, despite a hit message shown). carbon/apply_damage() now when we specify a def_zone and the corresponding BP is missing we default to the chest instead of stopping the proc. Consistently with how human/attacked_by() default to its attack to chest if missing limb.
- Fixes mini uzi icon when empty and no mag (typo).
- I renamed and changed a bit check_eye_prot and ear prot
- renamed flash_eyes to flash_act()
- I made a soundbang_act() similar to flash_act but for loud bangs.
- added a gib and dust animation to larva.
- husked monkeys
- no damage overlay for husk or skeleton.
- damage overlay for robotic limb now.
- no damage overlay when organic bodypart husked.
- one handed human with a bloody hand still get a bloody single hand overlay.
- fix admin heal being unable to heal robotic bodyparts.
- slightly touched robotic bodypart sprites (head one pixel too high)
- Fixes 18532 "beheaded husk has hair".
- Fixes 18584 "Ling stasis appearance bug"
- no more eyes or lipstick on husks.
- can remove flashes/wires/cells from robot chest and head with crowbar.
- Fixes not being able to surgically amputate robotic arm/leg.

* More merge conflict fixes and adding the new files I forgot to add.

* of course I forgot birdstation

* More typos and stuff I forgot to undo.

* Fixing a typo in examine.dm
Removing an unnecessary check.
Making admin heal regenerate limbs on all carbons.
Monkey-human transformation now transfer missing limbs info and presence of a cavity implant.
NODISMEMBER species can still lack a limb if the mob lacked a limb and changed into that new species.
Changeling Regenerate ability now also regenerate limbs when in monkey form. (and remove some cryptic useless code)

* Fixing more conflicts with remie's multihands PR.

* Fixes runtime with hud when calling build_hand_slots().
Fixes lightgeist healing not working.
Fixes null.handle_fall() runtimes with pirate mobs.
Fixes typo in has_left_hadn() and has_right_hand().

* Derp, forgot to remove debug message.
2016-09-12 19:33:50 +02:00
Leo 17ecd06950 Changes the ash drake armour on crafting recipe to match the actual item (#20122) 2016-08-25 23:56:32 -05:00
Ergovisavi 28b476ab6d Bonfires from Botany 2016-08-08 04:07:18 -07:00
Iamgoofball 41a5c65434 Re-adds Spear to tablecrafting menu, SLAPCRAFTING IS STILL ALIVE (#17985)
READ THE TITLE
2016-05-29 08:29:21 -05:00
KorPhaeron 81300765ee Respect the freeze 2016-05-18 00:37:03 -05:00
KorPhaeron ef9c9cd625 Fix for sinew belt recipe 2016-05-18 00:36:37 -05:00
KorPhaeron 0cf94ad6b0 Explorer Gear 2016-05-18 00:31:48 -05:00
TehZombehz 076fc0df79 Adds Bone Weaponry (#17672)
* Adds Bone Weaponry

Adds Bone Spears, Axes, and Daggers, all craftable.

* '''Balance'''

I listen to the suggestions of others.

* Fixes
2016-05-14 18:31:36 -05:00
Mercenaryblue 72ff107481 Clown Update - Golden Bike Horn (#17530)
* Golden Bike Horn 1.0.0

Adds the golden bike horn to the game.

* Golden Bike Horn 1.0.1

Adds a deaf check

* Golden Bike Horn 1.0.2

Removed the extra bike horn sound when hitting yourself.

* Golden Bike Horn 1.0.3

flip_mobs() proc optimize the code.

* Golden Bike Horn 1.0.4

Fixes

* Golden Bike Horn 1.0.4.b

mob/user

* Golden Bike Horn 1.0.4.c

Last change

* Golden Bike Horn 1.0.4.d

No longer responsible for the lack of returns
Honk

* Golden Bike Horn 1.0.4.f

Fudge
2016-05-14 16:11:45 -05:00
Razharas 0a3ddc886c Turns tablecrafting into personal crafting (#17341)
* Converts tablecrafting to datums

* Adds crafting.dm

Adds crafting.dm

* Fix merge conflicts

Fix merge conflicts

* Fixes dme

* Fixes returns

Fixes returns

* Only check hands and remove old paths

Only check hands and remove old paths

* Recipe fixes

Recipe fixes

* Removed action button

Removed action button
Added small ui button to inventory near the intent wheel
Removed debug
href_list is not longer /list

* Added adjucent checks

Added adjucent checks

* Snacks now get chems from parts

Snacks now get chems from parts

* Complex food fuckery fixed

Complex food fuckery fixed

* Fixes old recipe

Fixes old recipe

* Fix to infinite loops in reagent extraction

Fix to infinite loops in reagent extraction
It was finding old empty containers and tries to extract from them

* Fixes hands not checking

Fixes hands not checking

* Fixes reagents fucking up

Fixes reagents fucking up

* Even more reagent fuck ups fixed and comments

Even more reagent fuck ups fixed and comments

* Fixes all the shit i could find

Fixes all the shit i could find

* Removes debug and mechs

Removes debug and mechs

* Argument renaming

Argument renaming

* Fixes all argument names

Fixes all argument names

* Final fix of arguments

Final fix of arguments
2016-05-09 18:14:48 +02:00
phil235 524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment
Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm
2016-05-05 21:57:10 +02:00
phil235 68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02:00
TechnoAlchemist 528ce49e57 Adds dragon hide cloaks (#17322)
* dragon scales and cloak stuff

* Finishes shit with the ash drakes and the cloak

* woopsie
2016-05-04 00:43:31 -05:00