cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 04:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,323 Commits 61 Branches 14 Tags
ea16486efdbfcbe5a7dd6aa8754e06dd833862fe
Commit Graph

4005 Commits

Author SHA1 Message Date
Firecage
ea16486efd Statue fixes 2. 2014-12-27 22:24:06 +02:00
Firecage
7f1595dd7d Negligence from me. Fixed 2014-12-27 15:02:31 +02:00
Firecage
1d63ba5dec Adds some fixes to mineral statues 2014-12-27 14:55:02 +02:00
tkdrg
fc7c7b520d Merge pull request #6348 from paprka/highspeednodrag1v1mem80quickscopenotaser 
Blood-red hardsuit usability feature and syndicate loadout adjustments
 2014-12-27 02:59:24 -03:00
tkdrg
0b4261e016 Merge pull request #6355 from AnturK/librarian_pda 
Adds Librarian PDA cartridge
 2014-12-27 01:44:49 -03:00
Remie Richards
1f288f56ae Merge pull request #6290 from Xhuis/porta_console 
Handheld crew monitor
 2014-12-27 01:43:42 +00:00
tkdrg
f0cc5cce4d Merge pull request #6330 from RemieRichards/MapperFriendlySoundTrigger 
Simple sound effect map object
 2014-12-26 22:36:55 -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
paprka
5c8a8b5dca Merge branch 'master' of https://github.com/tgstation/-tg-station into highspeednodrag1v1mem80quickscopenotaser 
Conflicts:
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
 2014-12-26 09:09:24 -08:00
Razharas
7eb69190e7 Merge pull request #6356 from paprka/burtsfiya 
Burst fire for some projectile weapons
 2014-12-26 08:38:21 +03: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
21df99154d Merge branch 'master' of https://github.com/tgstation/-tg-station into burtsfiya 
Conflicts:
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	icons/obj/gun.dmi
 2014-12-25 13:51:43 -08:00
Cheridan
5d2994eb35 Merge pull request #6526 from paprka/secondchef 
Adds second chef position / Renames chef to cook
 2014-12-25 15:30:00 -06:00
paprka
591b2f363b Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-12-25 13:12:46 -08:00
tkdrg
96237278fa Merge branch 'master' into meido 
Conflicts:
	code/modules/clothing/under/miscellaneous.dm
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
 2014-12-25 12:41:29 -03:00
paprka
595ad8df58 fixed compile errors 2014-12-24 21:03:22 -08:00
paprka
7842ff8803 adds advanced tasers as default 2014-12-24 19:41:40 -08:00
paprka
1d1baa96bc Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-12-24 18:56:26 -08: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
paprka
2371e2ebd8 renames chef to cook 2014-12-22 17:02:06 -08:00
phil235
70edf69f25 Fixes table having two mousedrop_T() procs. 
Adding a rack_destroy() proc.
Fixes table blob_act and ex_act a bit.
 2014-12-23 00:22:57 +01: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
108a8cc155 Merge pull request #6473 from Delimusca/grenadeinhands 
Fixes grenades looking like flashes.
 2014-12-22 11:10:05 -08: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
paprka
47659dbbf4 Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2014-12-21 20:32:34 -08:00
MrPerson
c002d11ee7 Merge pull request #6476 from Cheridan/nightcrawler 
Refactors snowflake AI hosting in ninja
 2014-12-21 17:02: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
Remie Richards
5a48f313cb Merge pull request #6399 from paprka/radioshit 
Removes useless standard encryption keys from headsets
 2014-12-21 05:08:10 +00:00
Delimusca
80a4bc285d Adds empgrenade inhand, removes missed comment 2014-12-19 18:11:27 -07:00
paprka
f1963ce537 Merge branch 'master' of https://github.com/tgstation/-tg-station into parahats 
Conflicts:
	code/modules/clothing/head/soft_caps.dm
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2014-12-19 10:41:27 -08: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
Cheridan
25cc2999b0 Refactors snowflake AI hosting in ninja 
why did i volunteer for this

It just has an integrated intellicard now. The gloves do the transferring.
Also Intellicards are all called Intellicards now and not Intelicards.

the ai_transfer proc is less awful but it's still
awful
awful awful awful
 2014-12-18 21:03:09 -06: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
Delimusca
332cc37b13 Added grenade inhands. 2014-12-18 17:58:43 -07:00
Delimusca
4bdf83c59f Revert "adds grenade inhands." 
This reverts commit d1295616c8.
 2014-12-18 17:27:01 -07:00
Delimusca
d1295616c8 adds grenade inhands. 2014-12-18 16:57:47 -07: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
Cheridan
566066a73a Merge pull request #6441 from paprka/corpsecthecorpening 
Corporate Security aesthetic update
 2014-12-18 02:14:33 -06:00
paprka
9d46ccceac old warden jacket for the lockers 2014-12-17 23:01:10 -08: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
phil235
e132f206cf derp. 2014-12-17 22:47:50 +01:00