cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 19:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,186 Commits 62 Branches 14 Tags
35eecd7caef016eb55d1122fbf5e65f83cab11c8
Commit Graph

26439 Commits

Author SHA1 Message Date
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
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
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
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
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
Cheridan
5485f75bfd Merge pull request #17076 from ChangelingRain/sixtynineblob 
Blobbernaut tweaks
 2016-04-25 19:28:28 -05:00
TechnoAlchemist
98030c8480 """"""""Design Lead""""""""""" 2016-04-25 16:51:09 -07:00
TechnoAlchemist
04eac2cbe6 adds explorer belt. 2016-04-25 15:59:02 -07:00
Joan Lung
66a1520ad4 Merge pull request #17054 from coiax/processor-overload 
New Processor Overload event
 2016-04-25 18:40:22 -04:00
phil235
bb1f60e769 Fixes typos and errors I made. 
Fixes unscrewing a broken computer only dropping one glass shard instead of two.
Fixes AI holopad, recharger, keycard authentication device, reagent_dispensers reagentgrinder, and APC  not being attackable.
Fixes APC cover knockdown being random, it now uses the take_damage() proc, which also allows animals and xenos to knock down the cover of a broken apc.
 2016-04-25 22:29:17 +02:00
TheWiznard
2007a8241d removes comment 2016-04-25 15:21:52 -05:00
Shadowlight213
1743138d07 Fixes SSU dropping contents on opening 2016-04-25 11:32:21 -07:00
Shadowlight213
b23d676995 Fixes sloth ruin atmos runtime. 2016-04-25 10:54:45 -07:00
duncathan salt
4686f80b39 fixes horrible runtimes 2016-04-25 10:20:27 -06: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
duncathan salt
434c5f45be small optimization 2016-04-25 09:45:11 -06:00
duncathan salt
27bc533def fixes air bugs with the maploader changeturf, hopefully 2016-04-25 09:43:10 -06:00
duncathan salt
d7c1328c6f Merge pull request #17110 from tgstation/master 
updates my brand new branch cuz i'm an idiot
 2016-04-25 09:29:24 -06:00
duncathan salt
61ddd6797d Merge pull request #16969 from YotaXP/tgm-maploader 
[DNM] Updates the map loader to support TGM style map files
 2016-04-25 09:28:26 -06:00
Jack Edge
b9bd58de88 Grammar fixes 2016-04-25 16:28:16 +01:00
duncathan salt
c2a3ae9424 adds a new argument to ChangeTurf() which allows us to skip calling AfterChange() 2016-04-25 09:24:40 -06:00
Razharas
7e17d5a361 Merge pull request #17077 from KorPhaeron/gatling 
Undoes Gatling Nerf
 2016-04-25 17:08:11 +03:00
Jack Edge
8901ee0610 Actually compiles 2016-04-25 09:22:32 +01:00
Jack Edge
1a6ad107af Refactoring and tweaks 2016-04-25 09:01:52 +01:00
TheWiznard
19a6e140c3 fixes newline error 
moves a comment up
 2016-04-25 01:55:52 -05:00
TechnoAlchemist
497e1ae3a9 fixes plate consumption in upgrades. 2016-04-24 23:50:01 -07:00
Jack Edge
bb4f035fd6 Merge branch 'master' into slaughter-fixes 2016-04-25 07:32:40 +01:00
TechnoAlchemist
d1359a3e09 What's it gonna be, loyalty to me? Or loyalty to your country? 
(export datum tweak)
 2016-04-24 23:24:42 -07:00
Jack Edge
508522c320 Minor explosion damage around exploded machine 2016-04-25 07:15:32 +01: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
KorPhaeron
121564f927 Merge pull request #17027 from optimumtact/patch-1 
Properly revert the container drop code
 2016-04-25 00:58:28 -05:00
KorPhaeron
d32bfc4dc1 Merge pull request #17041 from Bawhoppen/boh 
Lets BoH hold mech parts
 2016-04-25 00:53:53 -05:00