cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 17:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,597 Commits 61 Branches 14 Tags
4e84fb2eeff70cd10e9ccfcd6042889d0ea1653b
Commit Graph

1583 Commits

Author SHA1 Message Date
tkdrg
4e84fb2eef Changes a missed del() to qdel() 2015-01-04 16:22:27 -03:00
tkdrg
2eb366de89 Fixes a few RPD painting bugs 
Changes RPD colors to be consistent with pipe painter & default pipes.
Makes the RPD properly update its neighbors on painting.
Offloads the neighbor updating logic from pipe_painter to a pipe proc.
Fixes #6783
 2015-01-04 04:35:36 -03:00
Remie Richards
3a10a3b198 Merge pull request #6427 from paprka/janitorbuffholyfuckvalvepleasenerf 
Adds dirt overlays for walking on simulated turfs
 2015-01-04 02:22:50 +00:00
tkdrg
ac57c7007b Merge pull request #6723 from Boggart/airlockconstructionfix 
Fixes being unable to build doors over firelocks, blast doors and shutters.
 2015-01-02 04:16:17 -03:00
tkdrg
38acdca156 Merge pull request #6713 from phil235/DicerollRuntimeFix 
Fixes runtime linked to diceroll proc
 2015-01-01 16:58:39 -03:00
Boggart
ff17e083eb Fixes being unable to build doors over firelocks, blast doors and shutters. 
As a result, any door with the sub_door variable set to 1 can have an airlock built over it.
Also fixes using a fireaxe to open unpowered poddoors and adds myself to the admins.txt.
 2014-12-31 20:47:17 -07:00
tkdrg
908922f24c Fixes Hulk crash bug and typos 2014-12-31 23:28:14 -03:00
tkdrg
9a9f0bc058 Merge pull request #6691 from Menshin/clientless_peeking_runtime_fix 
Fixes runtime with moving objects in/out of storage while clientless mobs peeking
 2014-12-31 22:19:38 -03:00
paprka
d048dd87bd Merge branch 'master' of https://github.com/tgstation/-tg-station into janitorbuffholyfuckvalvepleasenerf 2014-12-31 17:14:03 -08:00
tkdrg
cdb5066502 Merge pull request #6324 from Razharas/GenShit 
Added datum mutations
 2014-12-31 17:24:15 -03:00
phil235
57cf4bc394 Fixes runtime linked to diceroll proc 2014-12-31 20:47:32 +01:00
Menshin
4db3268fcb Fixes runtime when moving objects in/out storage while a clientless mob is peeking on the storage panel 2014-12-31 01:54:25 +01:00
Razharas
d1f347f584 Fixes conflicts 
There werent even any conflicts really, but git for some reason thought
there are
 2014-12-30 15:12:09 +03:00
Razharas
084d193409 Fixed dualsabers and hulks 
Fixed dualsabers and hulks
 2014-12-30 14:47:07 +03:00
Perakp
ee3617310e Merge remote-tracking branch 'upstream/master' into droneFix 2014-12-30 13:32:51 +02:00
Ergovisavi
d7765cd75f Merge pull request #6630 from tkdrg/rpdcolor 
Tested, appears to be functioning as advertised. Cue drones making absurd disposal rides.
 2014-12-29 11:14:20 -08:00
tkdrg
d96e8df573 Fixes some RPD bugs 
Fixes pipe painting not working
Fixes 4-way manifolds and disposals chutes displaying broken icons
Fixes the lack of Sort Junctions from the RPD
Fixes #6627
Fixes drones being unable to use the RPD
 2014-12-29 14:51:41 -03:00
Razharas
501a120cca Fixes the defines 
Now all the shit uses them i hope
 2014-12-29 16:25:33 +03:00
Razharas
10b21b20ab Conflicts resolution 
In items weapons melee misc
 2014-12-29 11:49:30 +03:00
Razharas
418e3a0613 General cleanup 
Fixed the magic text failing in monkey injectors
Removed lots of comments
Didnt fix mysterious list bounds runtime in tourettes
 2014-12-29 11:36:01 +03:00
paprka
152be974dc reverts return change (returns return change?) 2014-12-28 18:53:44 -08:00
paprka
bbc83fed1c Merge branch 'master' of https://github.com/tgstation/-tg-station into policebatonfixy 2014-12-28 18:39:39 -08:00
Razharas
76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts
 2014-12-28 11:20:15 +03:00
Razharas
208b59c30e Fixed stuff tkdrg pointed out 
Added comment to dualsaber and hulk checks to explain whats going on
Added defines that converts to mutation names
Fixed grammer again
 2014-12-28 10:49:04 +03:00
paprka
8535145401 Merge branch 'master' of https://github.com/tgstation/-tg-station into janitorbuffholyfuckvalvepleasenerf 
Conflicts:
	code/game/turfs/simulated/floor.dm
 2014-12-27 21:54:53 -08:00
tkdrg
cc474b2af6 Merge pull request #6591 from phil235/FingerlessSpriteFix 
Fix fingerless gloves icon and washing machine changing boxing gloves
 2014-12-27 15:46:43 -03:00
Remie Richards
84649dacd4 Merge pull request #6339 from tkdrg/rip'd 
Ports the rapid pipe dispenser (RPD) from /vg/
 2014-12-26 23:58:17 +00:00
tkdrg
fe139e437d RPD tweaks 
Turns the pipe modes into defines and adds some span classes
 2014-12-26 20:50:34 -03:00
phil235
b6e35278e3 Fixes cutting black gloves to make fingerless gloves not changing the icon to fingerless. 
Fixes the washing machine being able to change boxing gloves, ninja gloves and botany gloves to look like simple colored gloves. Creating a /gloves/color category for all gloves whose color can be changed.
Fixing some absolute pathing.
 2014-12-26 17:04:09 +01:00
hornygranny
09b4b7a3cc Merge pull request #6554 from paprka/jetpackssuck 
Makes jetpacks more obvious when they're on
 2014-12-25 21:25:56 -08:00
tkdrg
a94012b98a Ports the rapid pipe dispenser (RPD) from /vg/ 
These are pocket devices that dispense unwrenched atmos/disposal pipes.
Despite the admittedly misleading name, these have infinite ammo.
There is no need to reload with matter cartridges or anything like that.

Currently, they spawn in atmos tech lockers, and as an engiborg module.
More can be obtained with the autolathe.
They are also a traitor "steal item" objective.
 2014-12-25 22:06:39 -03:00
Cheridan
12ad2b796d Merge pull request #6541 from phil235/GrenadeAssemblyConstructionFailMsgFix 
Assembly holder no longer needs to be secured.
 2014-12-25 16:16:00 -06:00
paprka
e70506580b added message for toggling jetpack on and off 2014-12-24 16:10:44 -08:00
phil235
8ab92e753a Assembly holder is no longer secured or unsecured. Screwdrive now disassemble it and attack_self to interact with its parts. 
Adding feedback message when trying to attach two assemblies that aren't both in attach mode.
Fix hacky code to prime grenade by pulsing its assembly.
Removing some commented code and some duplicated proc instances.
Fixing a typo.
 2014-12-24 01:50:19 +01:00
Razharas
1b45752b05 Fixed conflicts 
Ye again and again and again and again
Do it again, do it again~
 2014-12-23 05:39:39 +03:00
Razharas
92fc9b5d1b And some more little fixes 
Return of the prob to foam smashing
Correct laserpointer check
Correct wield behaviour with hulk
 2014-12-23 05:22:20 +03:00
tkdrg
359c5896ed Merge remote-tracking branch 'upstream/master' into meido 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-12-22 16:19:43 -03:00
hornygranny
126be2f312 Merge pull request #6483 from MrPerson/storage_war_hunter_kings 
Always reset the layer of things removed from storage
 2014-12-22 10:42:48 -08:00
MrPerson
2f3bceb79c Merge pull request #6445 from phil235/GiveLightCig 
Refactoring cigarette lighting and esword activation a bit.
 2014-12-21 05:27:30 -08:00
Razharas
57b41dce0d Fixed some shiet 
Redone how injectors handle mutations(now it doesnt copy the SE but
manipulates mutations directly)
Removed sole leftovers
Fixed humanizing
Fixed grammer
 2014-12-21 08:19:23 +03:00
Razharas
9a27fe7c8d Conflict fix 
Yeah makes it all work
 2014-12-21 06:12:33 +03:00
MrPerson
2b763f18c1 Always reset the layer of things removed from storage 
Fixes #6470
 2014-12-19 09:42:06 -08:00
tkdrg
f1101f77a9 Adds 3 more scarves 
These striped scarves are made by MrSnapwalk. They are included in the
ClothesMate along with the other scarves (sprited by Nienhaus). These
have a striped texture.
 2014-12-19 00:24:01 -03:00
tkdrg
d44fa004b0 Merge branch 'master' into scarfs 
Conflicts:
	icons/obj/clothing/ties.dmi
 2014-12-18 23:35:15 -03:00
tkdrg
eaec9a6e1b 9 more scarves and small corgi cleanup 
Adds 9 more scarves (light blue, dark blue, orange, yellow, purple,
white, black, zebra and christmas).
Cleaned up corgi code a little bit, specially the parts involving icon
updates. Fixes a bug where adding a hat to a dead corgi didn't make you
drop your hat and created duplicate items. Makes corgis only use one
head/back mob sprite and rotate it appropriately. Call
regenerate_icons() only when needed now, instead of doing so every tick
on Life().
 2014-12-18 23:09:49 -03:00
tkdrg
d2c85dc9c4 Merge branch 'master' into meido 
Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
 2014-12-18 17:47:55 -03:00
hornygranny
ac5c322327 Merge pull request #6434 from paprka/singulobombing 
Fixes singulo bombing
 2014-12-18 10:39:57 -08:00
phil235
25188e441b Little fix. 2014-12-18 18:00:17 +01:00
tkdrg
62b99c7007 Adds scarfs 
These come in red and green, and can be equipped in the tie slot.
They are available from the ClothesMate vendomat. Sprites by Nienhaus.
 2014-12-17 19:19:15 -03:00
Cheridan
62252f0273 Merge pull request #6420 from phil235/TypoFix2 
Fixes a lot of "the the" in messages.
 2014-12-17 16:06:35 -06:00