Commit Graph

2366 Commits

Author SHA1 Message Date
Incoming c0d41485a3 Removes the "SmoothOperator" bundle for being dreadful compared to the other bundles
Bundle included
Stetchkin (TC ???): the gun we gave nuke ops to tell them they had to buy their own guns now. Has nonrefillable ammo.
A silencer (TC 2): makes the gun a normal item (one of its only pluses was it was a small item).
Syndie Soap (TC 1): slips forever.
A Trash Bag (TC 0): It's a bulky item so once you take it out of the box you're stuck explaining to everyone why you're carrying a trashbag as not a janitor.
A Body Bag (TC 0): Obtensibly to drag off corpses without leaving a mess... but then why do they get the soap?
A Suit (TC 0): Availible for free in the locker room closet
Lace Up Shoes (TC 0): "Shoot me, I'm valid!"

Since you can't buy a Stetchkin I can't give it an absolute value, except to say that it's worse in almost every respect to the revolver. which is 6.

Even if you are VERY charitable and give it the full 6 valuationyou still have a bundle that awards you less than 10TC of items where every other bundle awards you more than 10TC (that's the point of taking a bundle).

http://www.youtube.com/watch?v=RiMOKmp0uZc
2014-01-26 22:41:48 -05:00
fleure 8660698ce0 Merge pull request #2444 from Miauw62/somebodyfinallydoessomethingaboutnewlingsuckingpleaselickmyfeetnow
Adds changeling arm blades
2014-01-24 12:49:05 -08:00
fleure 277a33c184 Merge pull request #2482 from Tenebrosity/throwsounds
Thrown objects play throwhitsound
2014-01-24 11:37:06 -08:00
fleure e8573cc416 Merge pull request #2373 from RobRichards1997/14/01/2014-Bug-Fixes
Robotic Repair Missing fixes [Fixes #2326]
2014-01-24 11:17:54 -08:00
fleure 7abb6d1af4 Merge pull request #2484 from Giacom/bloody_hands_so_real
You can now properly clean your hands of blood. Fixes #2258.
2014-01-24 11:15:32 -08:00
Tenebrosity e4739afc44 Item throwtapsound var for forceless objects 2014-01-23 23:07:24 +13:00
Tenebrosity b77434b1cb Items now have a throwhitsound var
If throwhitsound isn't defined, a thrown item calls the hitsound
instead. If that isn't defined, no sound is played.

Circular saw now calls pierce.ogg as its throwhitsound instead of its
hitsound.
2014-01-23 16:37:54 +13:00
Giacomand 4b51e6d386 Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2371 2014-01-22 20:01:11 +00:00
Giacomand 6a497b98ad Added the SetEmagged proc, for cyborgs, and replaced code to use it.
Added get_inactive_modules and get_usable_modules procs to use while looping through the cyborg's modules.
The cyborg's storage screen will now shrink if there is an empty row.
Added a new on_emag proc for modules, which is called when the module is emagged. Miner borgs use it to replace their borg drill for a diamond one.
Fixes a runtime where there is no client to update the hud.
Fixes a bug where if you emag a cyborg with no module and when they choose a miner they do not receive their diamond drill.
2014-01-22 20:00:39 +00:00
Giacomand 86d4d5307a You can now properly clean your hands of blood. Fixes #2258.
When you touch an item, to spread the blood, it would take the "bloody_hands" to 0; which is checked if true while you wash your hands. I limited it to only go down to 1, so it will still be true unless you wash your hands.
Fixed an issue where blood_DNA was being cleared before the blood_hands variable was being set to 0. Now you can properly hide your bloody hands with gloves and when you take them off the hands will still be bloody.
Removed an unused variable.
Set the bloody_hands_mob to null where it was appropriate.
The amount of blood you can transfer to other items, when you touch them, will be a little random for variety.
Revive() will now heal your hallos damage.
2014-01-22 17:42:36 +00:00
Miauw 4bdffc2dc3 Merge branch 'master' of https://github.com/tgstation/-tg-station into somebodyfinallydoessomethingaboutnewlingsuckingpleaselickmyfeetnow
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2014-01-22 17:01:20 +01:00
fleure da5ef34c29 Merge pull request #2461 from JJRcop/nuke-toy-tweaks
Nuke toy tweaks
2014-01-22 07:52:13 -08:00
Cheridan 290180dec8 Merge pull request #2387 from MrPerson/Animation_OLD
Mobs use animate() to rotate
2014-01-21 20:39:12 -08:00
MrPerson 9058921972 Merge branch 'master' of https://github.com/tgstation/-tg-station into Animation_OLD
Conflicts:
	code/game/objects/items/weapons/shields.dm
	code/modules/events/ninja.dm
	code/modules/mob/living/carbon/human/update_icons.dm

No more cloakers, no more cloak_stacks. Also removed that silly "I'll make an icon and then make an image of that icon" bullshit.
2014-01-21 15:19:27 -08:00
JJRcop 36ec9cbb6b Nuke toy no longer uses process and instead uses sleep
I don't know what I was thinking with the process, oh well!
2014-01-21 16:52:10 -05:00
JJRcop 0e45022798 Resolved more conflicts with drying rack before being pulled
Conflicts:
	code/modules/hydroponics/seeds.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/hydroponics.dmi
Readded missing file changes to icons/obj/harvest.dmi
2014-01-21 13:01:53 -05:00
Robson Richards 1ff14a5fcf Adds item_heal_robotic() - a way for items to trigger robotic limb heal procs without copy-paste 2014-01-21 07:38:46 +00:00
JJRcop a52678531c Nuke toy tweaks
Made the cooldown noticable
Shortened cooldown to 3 minutes
2014-01-20 15:38:06 -05:00
Pete Goodfellow e8ed1a83f7 Merge branch 'master' of github.com:tgstation/-tg-station into waistcoat2
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
2014-01-20 19:29:47 +00:00
fleure ad49512b4e Merge pull request #2440 from Petethegoat/suicideformat
Updated all suicide_act()s to use a new span class, 'suicide'.
2014-01-20 11:11:23 -08:00
fleure d6964e703d Merge pull request #2442 from Alek2ander/master
Logs, logs everywhere
2014-01-20 11:08:57 -08:00
Cheridan 9cbb9bb403 Merge pull request #2434 from johnsmith38/master
Black Baseball Caps [FIXED]
2014-01-19 20:21:40 -08:00
Cheridan 70e5618cb0 Merge pull request #2375 from Giacom/remove_icon_operations_from_premises
[501] Refactored the code to remove most icon operations for changing an icon's colour.
2014-01-19 16:06:25 -08:00
Alek2ander ecf50f2de8 Goodbye nuke 2014-01-19 22:15:28 +04:00
Miauw 13b3cd69f2 Adds changeling arm blades that can slice tables apart and break computers and generally be robust. 2014-01-19 18:33:03 +01:00
Alek2ander 9fa38637ad Logs everywhere
Explosion game log now has epicenter coords
Powersink placement and explosion notifications
C4 notifications and logs
Logging singulo munchies and death
All SMES interactions now logged, because any of them can mess stuff up
Telesci logs what was teleported
2014-01-19 21:16:30 +04:00
Pete Goodfellow af4849ce72 Updated all suicide_act()s to use a new span class, 'suicide'. 2014-01-19 16:46:37 +00:00
Pete Goodfellow 5222191b73 Changes the waistcoat path from /obj/item/clothing/suit/wcoat to /obj/item/clothing/tie/wcoat so you can wear it under a spacesuit or suit jacket.
Also makes ties show up on the jumpsuit object.
2014-01-19 14:50:27 +00:00
John Smith a3e94d74e9 Black Baseball Caps [FIXED] 2014-01-19 00:35:10 -08:00
fleure cd5fb384f0 Merge pull request #2409 from Rolan7/Issue112_Powersinks
Fixes Issue 112, APCs not charging
2014-01-18 17:30:02 -08:00
fleure 4efa6b3114 Merge pull request #2412 from Razharas/BorgAndGhostClickDragInventory
Fixes borgs and ghosts storages
2014-01-18 17:29:44 -08:00
Hornygranny 01ce0f5392 Removed copypaste for cyborg metal sheets
Fixed typos
2014-01-17 15:45:09 -08:00
fleure d6937897f1 Merge pull request #2399 from Glloyd/master
Fixes the back icons for the scythe and the Roman shield.
2014-01-17 15:23:57 -08:00
Razharas 0dcb8a8042 Fixes borgs and ghosts storages
Fixes #2084
2014-01-18 03:23:02 +04:00
Rolan7 f5267c22db Fixes Issue 112 which was due to powersinks draining cells without telling the APC, resulting in the APC believing itself to be full. 2014-01-17 17:21:38 -05:00
Miauw 9c68b28425 Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid 2014-01-17 17:51:37 +01:00
JJRcop 36a346c367 Changes drying rack to use color var and removes "_dry" icons
Removed watermelon's dried_state
Puts cigarette reagent code in a proc
2014-01-17 11:26:24 -05:00
Glloyd b69ab81cc6 Resolves #2213 Fixes the back icons for the scythe and the Roman shield. 2014-01-16 20:23:36 -05:00
Cheridan e0c9a48a36 Merge pull request #2376 from Aranclanos/captainmedal
Adds the captain's medal to the medal's lockbox.
2014-01-16 12:51:08 -08:00
Miauw 6704a9948d Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid 2014-01-16 19:46:04 +01:00
Giacomand aceb4b22e1 Removed the icon color blend operations from human's update_icons().
Changed all the hair/facial_hair/eye sprites to use a white base.
Changed the preview screen, in the preference menu, to use ICON_MULTIPLY to be able to use the new white sprites.
Removed the unused and broken cloaking item.
Ninjas now use the alpha variable, removed most of the checks for it.
Updated the documentation a bit.
Added some helper procs for later.
2014-01-16 14:33:50 +00:00
fleure 088e9fb80a Merge pull request #2354 from Incoming5643/slimetime
Slime Mob Refactor
2014-01-16 06:20:03 -08:00
MrPerson 5987de4804 Redo on that merge into master, my bad. 2014-01-15 20:12:52 -08:00
MrPerson 9a562efb35 Update to master (branch was way out of date) 2014-01-15 19:34:35 -08:00
MrPerson 2f90172273 Give mob/living a cloak_stacks list. If there's anything in this list, cloak the mob upon the next update_transform().
Give all mob/living/carbon a shared update_transform(). Larva have their own because they're special.
2014-01-15 19:23:57 -08:00
Aranclanos f81ae6fb34 Adds the captain's medal to the medal's lockbox.
Fixes issue 2358
2014-01-15 19:10:30 -03:00
Giacomand 11bca59614 Refactored the code to remove most icon operations for changing an icon's colour. I had to manually set all the icons, which are subject to colour change, to be have a white/grey icon, so that the colours added properly, and then have them coloured in the code. This means the icons for runes, the reagent beaker overlay, smoke and etc will all be white. They now all use the new 500+ color variable.
The only noticeable gameplay difference is that you can't choose your graffiti's shade.
2014-01-15 21:30:55 +00:00
JJRcop 6e55f3e50b Fixes some issues with rollie paper packs and incorrect icon state names 2014-01-15 16:04:07 -05:00
Robson Richards 4dabdc67e2 Fixes #2326
- Moves Robotic repair stuff to the two item's respected attack()'s
- Removed them from the human_defense.dm
2014-01-15 16:46:47 +00:00
JJRcop 4404d2462e Fixing conflicts
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2014-01-15 09:37:17 -05:00