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

1302 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
Balrog
461415430e Merge remote-tracking branch 'origin/master' into inb4gambittraitor 
Conflicts:
	icons/obj/toy.dmi
 2014-01-26 14:02:35 -05: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
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
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
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
JJRcop
a52678531c Nuke toy tweaks 
Made the cooldown noticable
Shortened cooldown to 3 minutes
 2014-01-20 15:38:06 -05: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
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
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
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
Balrog
163a6fe0e0 Fixed some stupid snowflake in card attacking 2014-01-16 15:39:06 -05: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
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
Balrog
5a6f29b3d5 Added syndicate playing cards. As a consequence card code now supports multiple deck styles. 2014-01-14 20:24:53 -05:00
sirbayer
eb20908dcf Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets 2014-01-13 14:08:57 -08:00
Cheridan
0b2a1b7ac4 Merge pull request #2323 from dumpdavidson/empkit_balance 
Balance changes to the EMP kit
 2014-01-12 13:09:56 -08:00
Giacom
6dc7736933 Merge pull request #2244 from VistaPOWA/syndieborgs 
[MAP] Adds Syndicate Borgs
 2014-01-12 05:30:22 -08:00
Ergovisavi
4948820b67 Gibtonite - Uncommited the .dme changes, fixed countdown(), removed redundant checks 2014-01-11 12:47:30 -08:00
dumpdavidson
646df06cf9 moved when the emp_act is called in the afteratack proc of the emp flashlight 
using absolute paths everywhere now.
adds a backslash to prevent "The the flashlight..."
 2014-01-11 21:40:15 +01:00
dumpdavidson
cf672d2c29 Balance changes to the EMP kit: 
- EMP-Flashlight now has one charge less but recharges (slower than lasers/energy crossbows do)
- EMP-Flashlight description no longer reveals the nature of the device
- EMP implant now has two uses
- EMP kit now contains two grenades
- EMP and adrenaline implants now inform the user how many charges they contain to begin with (freedom doesn't because it's intentionally random)

- Fixes EMP flashlight sometimes going down to -1 charges.
 2014-01-11 21:04:35 +01:00