cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-10 08:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,583 Commits 60 Branches 14 Tags
a72e48ffe3d8a95b0d6ee5efe0ffbd1c3dbe919c
Commit Graph

1976 Commits

Author SHA1 Message Date
MMMiracles
a72e48ffe3 the fact this never came up is surprising 2016-05-01 12:20:06 -04:00
Jordie
9c53ce5f85 Merge pull request #17240 from Core0verload/firecabinet_decon 
Wall-mounted extinguisher cabinets are now constructable/deconstructable
 2016-05-01 18:09:25 +10:00
KorPhaeron
d8db2a1643 Merge pull request #17224 from ChangelingRain/IDlock 
Hitting a locker or crate with an ID, PDA with ID, or wallet with ID will try to toggle the lock instead of opening it
 2016-04-30 05:32:42 -05:00
Cheridan
d662b0e455 Merge pull request #17218 from phil235/FixTalkingInPipes 
No longer deaf while inside pipes
 2016-04-29 20:34:03 -05:00
phil235
7900f80544 Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAlienStructureProjDodge 
Conflicts:
	code/game/objects/structures/aliens.dm
 2016-04-29 20:58:02 +02:00
Joan Lung
6fc1d4fde4 Blobs can no longer eat the supermatter (#17205) 
* Blobs can no longer eat the supermatter

* phil'd

* phil'd
 2016-04-29 20:29:20 +02:00
Cheridan
1e0c5acd1f Merge pull request #17211 from phil235/FixThermiteBorg 
Fix bundle: borg module, thermite, chairs
 2016-04-29 13:22:50 -05:00
Razharas
ae78dd582a Merge pull request #17208 from phil235/FixMechaMaskToxin 
Fix bundle and mech melee attack animation
 2016-04-29 19:32:38 +03:00
Razharas
6f8b1bc295 Merge pull request #17124 from MrPerson/wrapped_up_nicely_with_a_bow 
Removes monkeycube and chocolate unwrapping
 2016-04-29 16:03:59 +03:00
c0
a7088757ed Wall-mounted extinguisher cabinets are now constructable/deconstructable 2016-04-29 15:31:23 +03:00
Cheridan
034500f622 Merge pull request #17188 from phil235/FixClosetStuffing 
Fixes weird shit happening when clickdragging things from your
 2016-04-28 23:49:34 -05:00
Nerd Lord
49dd259cbc Attacking a locker or crate with an ID-containing object will toggle the lock instead of opening it 2016-04-28 22:34:37 -04:00
phil235
750eaa4a57 invisibility = 100 and 101 now use defines. 2016-04-29 01:00:05 +02:00
phil235
d5af5ca696 Objects with invisibility = 101 are ignored by procs like view() that are used for say() and visible_message(). 
Objects that are simply hidden (instead of being abstract things) now always use invisibility = 100.
This fixes not being able to hear what you say while inside a hidden gas/disposal pipe.
Fixes the t-ray scanner revealing abstract object that should never be seen, like spacevine controller.
Fixes not hearing anything during a mob transformation.
 2016-04-29 00:04:40 +02:00
phil235
be57a223b5 Moves alien structure into the proper folder objs/structures/aliens.dm 
Removes incorrect comment about forcedodge projectile.
 2016-04-28 22:44:26 +02:00
Razharas
173ee4a680 Merge pull request #17178 from ChangelingRain/plantdream 
Adds plant DNA machine to Dreamstation
 2016-04-28 22:50:34 +03:00
phil235
d3fa99e58b Fixes runtime when thermiting a wall 
Fixes not being able to put down a chair on a tile with a border window.
Fixes Borg module cycling not working when the first module is empty.
 2016-04-28 20:44:02 +02:00
phil235
b8164b7b92 * Add an attack animation for mech melee attack. 
* Fixes mech action button icon not updating whent the button is activated.
* Fixes internal tank action button icon not updating to off when we adjusted our masks out.
* Fixes mime/clown mask not updating their action button icon when adjusting. Fixes clown mask not updating
its on mob icon if adjusted when worn.
* Fixes typo in the human threshold for toxin in the air.
* Fixes changing the thermomachine circuitboard settings not giving any feedback.
 2016-04-28 18:56:14 +02:00
Nerd Lord
3c2f41c8d2 dreamstation maps 2016-04-28 10:34:33 -04:00
Joan Lung
cc59925d2e Merge pull request #17108 from Bawhoppen/sandbagsz 
Some sandbag changes
 2016-04-27 20:23:21 -04:00
phil235
fb93f88fca Fixes weird shit happening when clickdragging things from your inventory into a closet to stuff it in. You can now only stuff mobs and items into closet, and you cannot stuff things that are inside something (mostly your inventory). 2016-04-28 01:45:44 +02:00
KorPhaeron
cf08028eb0 Merge pull request #17046 from PKPenguin321/krav-sec-warden 
Gives krav maga gloves to the warden
 2016-04-27 16:09:04 -05:00
Razharas
c396cd5be5 Fixes falsewalls being unsmashable (#17135) 
* Fixes falsewalls being unsmashable
 2016-04-27 17:29:56 +02:00
PKPenguin321
1192b48c97 moves krav gloves off of warden and into his locker 2016-04-26 16:41:53 -07:00
phil235
6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction 
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
 2016-04-26 21:49:51 +02:00
erwgd
02b29f888a Prevents collapsing roller beds or grabbing chairs whilst incapacitated (#17074) 
* added if(usr.incapacitated) for grabbing a chair

* added if(usr.incapacitated()) for collapsing a roller bed
 2016-04-26 19:41:21 +02:00
MrPerson
1a3aaff808 Removes monkeycube and chocolate unwrapping 
Pointless time wasters that add nothing to the game experience. Also removed the two wrapped sprites for completeness.
 2016-04-25 18:20:01 -07:00
Joan Lung
ad9eec737f Merge pull request #17083 from coiax/ian-looks-very-fashionable-today 
Refactors dog clothing
 2016-04-25 11:46:44 -04:00
Lularian
322fc535ad sandbags rah rah rah 2016-04-25 05:04:11 -05:00
KorPhaeron
3934b7ae3d Merge pull request #17078 from ChangelingRain/opensesame 
Hitting a closet with an item will try to open it
 2016-04-25 01:00:50 -05:00
phil235
fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction 
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
 2016-04-24 21:22:37 +02:00
phil235
43e98079f1 Removing some comments I had left in. 2016-04-24 21:12:04 +02:00
phil235
639ff5d161 Doors can now be attacked when clicked on harm intent. (they're currently indestructible so it's only cosmetic for now). I tried to make door code more OOP. 2016-04-24 20:39:30 +02:00
phil235
0480790b0a Same things but with structures now. 2016-04-24 20:38:33 +02:00
phil235
0caa59b21a First commit of this big PR 
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
 2016-04-24 20:26:24 +02:00
Jack Edge
0fd1f3c7e4 Made /datum/dog_fashion 2016-04-24 13:18:43 +01:00
Nerd Lord
6a3f1c843a frankly, too fast 2016-04-23 21:55:15 -04:00
Nerd Lord
9fdfd4a49e Hitting a closet with an item will try to open it 2016-04-23 21:53:11 -04:00
KorPhaeron
18ce641950 Merge remote-tracking branch 'refs/remotes/tgstation/master' into USA 2016-04-23 15:14:09 -05:00
Nerd Lord
fb87a435d1 Aliens and monkeys can now climb structures 2016-04-21 08:59:47 -04:00
KorPhaeron
3527347160 Shock Revolver 2016-04-18 21:29:43 -05:00
Nerd Lord
9bd1d57061 You can actually place items in crates now 2016-04-18 19:21:02 -04:00
Cheridan
abb48c84eb Merge pull request #16920 from PKPenguin321/patch-5 
[s] FUCKING GHOST FAGS
 2016-04-18 14:27:18 -05:00
Cheridan
c43d69bd0c Merge pull request #16919 from ChangelingRain/voicefromthecrate-r 
You can now climb onto crates
 2016-04-18 14:12:54 -05:00
Cheridan
e7f7704099 Merge pull request #16921 from RandomMarine/theclothening 
Biogenerated cloth stacks.
 2016-04-18 02:27:36 -05:00
PKPenguin321
c6b9b620fb istype(user) 
i hope i did that right
 2016-04-17 15:15:52 -07:00
Joan Lung
d1e90e4dc6 Merge pull request #16915 from coiax/holodeck-chairs 
Wooden holodeck chairs can no longer be picked up
 2016-04-17 11:56:29 -04:00
Jack Edge
336612f663 You can't pick up NODECONSTRUCTed chairs 2016-04-17 14:39:42 +01:00
RandomMarine
76212a5fb9 Implements cloth stacks 2016-04-16 12:56:37 -07:00
PKPenguin321
e5a9920874 fixes ghost fire extinguishers FOR REAL 2016-04-16 10:58:30 -07:00