cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-12 09:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,228 Commits 61 Branches 14 Tags
fb93f88fcae390d5cf27e2c4331a116a4e79c22a
Commit Graph

26471 Commits

Author SHA1 Message Date
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
efa60f8587 Fixes BoHs 
Fixes BoHs
fix https://github.com/tgstation/-tg-station/issues/17173
 2016-04-27 21:33:36 +03:00
KorPhaeron
44b276859e Merge pull request #17140 from ChangelingRain/shaketheroom 
Charger holoparasites now shake the target's camera
 2016-04-27 13:24:54 -05:00
Cheridan
eb7b0e528c Merge pull request #17097 from Shadowlight213/Jetpackimplant 
Fixes jetpack implant speed boost inconsistency.
 2016-04-27 13:13:28 -05:00
Cheridan
3a91fab55c Merge pull request #17163 from phil235/ImprinterFix 
Imprinter fix
 2016-04-27 12:41:16 -05:00
Cheridan
1aa9a61e9e Merge pull request #17171 from phil235/AtmosFiixx 
Fixes the air subsystem initialization.
 2016-04-27 12:37:00 -05:00
phil235
b2a04afd39 Fixes the air subsystem initialization. 2016-04-27 19:28:13 +02:00
KorPhaeron
ccb24e80c1 Merge pull request #17167 from phil235/AbstractFix 
You can attack with ABSTRACT items again.
 2016-04-27 12:03:23 -05:00
phil235
61c037389e You can attack with ABSTRACT items again. 2016-04-27 17:45:56 +02:00
Razharas
88b55ced87 Fixes chameleon projector explosion protection (#17138) 
Fixes chameleon projector explosion protection
 2016-04-27 17:31:54 +02:00
Razharas
c396cd5be5 Fixes falsewalls being unsmashable (#17135) 
* Fixes falsewalls being unsmashable
 2016-04-27 17:29:56 +02:00
Joan Lung
ffc87184f0 You can now analyze blobs to check material effects, blob type, and health 
* You can now analyze blobs to check material effects, damage resistance, and health.

* beep beep

* slime extinguishes stuff

* I need to check my code

* wew

* buffnerfs

* fuckthemeta

* morebuffs

* no unfriendly fire

* damn my urge for low linecounts

* this makes me want to drink heavily

* if you see something, say nothing, and drink to forget

* waiting for an answer is for scrubs

* if you see something say nothing and drink to forget

* no resist printout

* phiiiiiiiil
 2016-04-27 10:24:47 -05:00
Joan Lung
a5fffec3a4 Merge pull request #17137 from Razharas/BoHinBoHFix 
Fixes drone or any other boh in boh abuse
 2016-04-27 08:45:31 -04:00
phil235
33d84ef73f Fixes inserting reagents in RnD machines 2016-04-27 13:05:13 +02:00
phil235
9657f328ec Fixes Reagent insertion in RnD machines 2016-04-27 13:04:05 +02:00
phil235
f4f09704eb fixes not being able to pour reagents in circuit imprinter/protolathe 2016-04-27 13:03:19 +02:00
Cheridan
e6509ddd23 Merge pull request #17115 from KorPhaeron/gun_fix 
[S] Fixes minigun bugs
 2016-04-27 02:52:22 -05:00
Cheridan
3a8fe0913b Merge pull request #17116 from KorPhaeron/lockdown 
Lockdown Fix
 2016-04-27 02:21:55 -05:00
KorPhaeron
39c1af5792 Merge pull request #17147 from TechnoAlchemisto/skullhelm 
Adds craftable skull helmet.
 2016-04-26 23:56:34 -05:00
KorPhaeron
72c10bef00 Merge pull request #17132 from tgstation/duncathan-patch-1 
processor overload requires 20 players
 2016-04-26 23:22:59 -05:00
KorPhaeron
35eecd7cae Merge pull request #17114 from Shadowlight213/Dropdump 
Fixes SSU dropping contents on opening
 2016-04-26 23:21:46 -05:00
KorPhaeron
12d5a910b5 Merge pull request #17119 from TechnoAlchemisto/Mining_Harness 
Adds explorer belt to mining vendor.
 2016-04-26 20:06:48 -05:00
PKPenguin321
1192b48c97 moves krav gloves off of warden and into his locker 2016-04-26 16:41:53 -07:00
TechnoAlchemist
0a8da62457 adds primal category to stop clutter in cat_misc. 2016-04-26 16:34:54 -07:00
phil235
dc730e9b5b Fixes typo making the destructive analyzer always be busy. 2016-04-27 01:00:39 +02:00
LatD
12f9d205e8 Syndicate bomb delay wire changed to one time use (#16790) 
* Syndicate bomb delay wire

* Fixes delay wires

* Add bomb delay variables

* Forgot to remove unused var

* Small fix
 2016-04-26 23:28:01 +02:00
Shadowlight213
ad6ff2515b Var stuff 2016-04-26 13:49:35 -07:00
TechnoAlchemist
5b19023f24 adds skull helmet. 2016-04-26 13:35:00 -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
phil235
b7da04e8c8 You can now use your PDA on the emergency shuttle console. 2016-04-26 21:43:11 +02:00
KorPhaeron
2bc85f6e9e Merge pull request #17134 from Zuvassin/fortheskullthrone 
Adds champion armour to necro chests
 2016-04-26 12:51:05 -05:00
kevinz000
de5a214132 Fixes detection multitool (#17011) 
* detectionfix

* unnessacary_things_removal

* Uranges
 2016-04-26 19:49:11 +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
phil235
b12e396f7f Merge pull request #17087 from optimumtact/patch-4 
Fix a typo in string lists system
 2016-04-26 19:34:24 +02:00
Nerd Lord
fe0f4e2ad0 Charger holoparasites now shake the target's camera 2016-04-26 11:22:22 -04:00
Razharas
534d970567 Fixes drone or any other boh in boh abuse 
Fixes drone or any other boh in boh abuse
 2016-04-26 15:34:49 +03:00
KorPhaeron
b8c6e93b29 Merge pull request #16732 from Iamgoofball/patch-22 
Fluorosulfuric SACid
 2016-04-26 05:13:09 -05:00
Zuvassin
dadae277cb Adds champion armour to necro chests 2016-04-26 18:55:31 +10:00
duncathan salt
bebe046aca Merge pull request #17103 from TheWiznard/malfmodfix 
removes a comment from malf modules
 2016-04-26 01:12:09 -06:00
duncathan salt
62688574bc processor overload requires 20 players 2016-04-26 01:05:15 -06:00
KorPhaeron
08eca42e00 Merge pull request #17061 from TechnoAlchemisto/Bracers 
Adds craftable bracers, adds watchers dropping bones.
 2016-04-26 01:39:50 -05:00
KorPhaeron
c1987f699a Merge pull request #17093 from RandomMarine/cockroach 
Drones stop squishing cockroaches.
 2016-04-26 01:17:40 -05:00
KorPhaeron
f39ca0d568 Merge pull request #17131 from tgstation/duncathan-patch-1 
fixes watcher sinew origin tech
 2016-04-26 01:13:28 -05:00
Cheridan
07f17f8d61 Merge pull request #17111 from tgstation/ruinfix 
Should fix the maploader bugs
 2016-04-26 01:10:42 -05:00
duncathan salt
0f0aa25976 fixes watcher sinew origin tech 2016-04-25 23:44:06 -06:00
TechnoAlchemist
930f49589d nerfs bracers :( 2016-04-25 21:01:31 -07:00
KorPhaeron
5b6d1386fd Merge pull request #17101 from TechnoAlchemisto/goliathplateREFACTOR 
Makes goliath plates stackable.
 2016-04-25 22:35:43 -05:00
TechnoAlchemist
18e1c7825d bigger 2016-04-25 19:40:51 -07:00
Cheridan
8a90e6a6ff Merge pull request #17113 from Shadowlight213/Doesn'tfixingthisviolatetheruin 
Hopefully fixes the sloth ruin atmos runtime.
 2016-04-25 21:01:22 -05:00