cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 04:55:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,752 Commits 61 Branches 14 Tags
0851b341da98d521897450bbd548fe7aeec4f2e0
Commit Graph

2379 Commits

Author SHA1 Message Date
Tenebrosity
0851b341da - Removes the throwtapsound var from items. It was unnecessary. 
- Thrown items play throwhitsound on impact. If no throwhitsound is defined, they play hitsound instead. If that isn't defined, they play genhit.ogg. The latter fixes \#2508. The volume of the sound is dependant on the item's throwforce and/or weight class.

- Adds 15 throwforce to the fireaxe, which previously had only 1.
 2014-01-29 10:51:14 +13:00
fleure
7009c447f1 Merge pull request #2393 from Balrog-was-here/inb4gambittraitor 
[MAP] Syndicate playing cards and deck style support for playing cards
 2014-01-26 12:19:11 -08:00
Balrog
461415430e Merge remote-tracking branch 'origin/master' into inb4gambittraitor 
Conflicts:
	icons/obj/toy.dmi
 2014-01-26 14:02:35 -05:00
fleure
fba7c32a5c Merge pull request #2455 from Rolan7/Issue297_Gib_Fix 
Issue 297 Gibbing in pipes fix
 2014-01-26 10:56:26 -08:00
Balrog
c5a2f28a47 Refactored card vars. Fixed some broken card deck instances on the map. 2014-01-26 13:55:57 -05:00
Ergovisavi
cc738f7dcd Merge branch 'master' of https://github.com/tgstation/-tg-station into Gibtonium 2014-01-24 16:33:51 -08: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
Ergovisavi
c1fa50976b Merge branch 'master' of https://github.com/tgstation/-tg-station into Gibtonium 2014-01-20 17:48:38 -08:00
Rolan7
5d931d70ef Larvae who chestburst while their host is swallowed are now properly added to stomach_contents, so they can be regurgitated. As are the gibs from the gibbing. 
Tidied up the loop in alien_powers.dm
 2014-01-20 15:43:43 -05: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
Rolan7
5f1fae05dd Gibbing now occurs in whatever the mob happens to be in, instead of fetching the turf. 2014-01-20 01:37:43 -05: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
Balrog
fe8dba3dc1 Refactored card code to remove copypasted variable assignment. Card objects are now children of /obj/item/toy/cards. 2014-01-18 20:14:21 -05: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
Balrog
574e240649 Merge remote-tracking branch 'origin/master' into inb4gambittraitor 2014-01-16 16:21:46 -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
Balrog
163a6fe0e0 Fixed some stupid snowflake in card attacking 2014-01-16 15:39:06 -05:00