cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 21:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,360 Commits 61 Branches 14 Tags
bf25d38fb2cb392ebeef7bda5c3f16fc07f2cc24
Commit Graph

7111 Commits

Author SHA1 Message Date
tkdrg
bf25d38fb2 Merge pull request #6607 from paprka/aiturrets 
Fixes ai turrets having disable mode instead of stun
 2014-12-28 02:21:04 -03:00
tkdrg
c57c75b232 Merge pull request #6604 from paprka/disablerhitsound 
Disabler now makes a sound when it hits
 2014-12-28 02:06:55 -03:00
tkdrg
60fc73d018 Merge pull request #6587 from phil235/MonkeyBiteMaskFix 
Fixes being able to bite as a monkey with your mouth covered by a mask.
 2014-12-28 01:01:14 -03:00
Ergovisavi
ff68a2d55b Merge pull request #6490 from tkdrg/nomoreadmingrudges 
Adds cfg option to let players see their own notes
 2014-12-27 19:25:43 -08:00
Swag McYolosteinen
4205b8d531 Merge pull request #6620 from Menshin/missed_designs 
Fixes missing designs for the protolathe construction
 2014-12-27 20:35:08 +01: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
tkdrg
7f7fad7ac9 Merge pull request #6586 from phil235/ResonatorTableFix 
Fixes the resonator being activated when placed on a table/closet/storage
 2014-12-27 15:06:36 -03:00
phil235
f8b7a2066f Merge pull request #6559 from tkdrg/hal 
Adds sanity checks to supermatter Consume()
 2014-12-27 18:42:01 +01:00
Menshin
9d430e1470 Done some missed designs for the R&D revamp. 2014-12-27 16:49:11 +01:00
tkdrg
1846489593 Merge pull request #6589 from phil235/SiliconPunchMsgFix 
Fixes message typos
 2014-12-27 11:48:54 -03:00
tkdrg
e00a1b0806 Merge pull request #6572 from paprka/fixescargo 
Removes broken tactical helmets crate
 2014-12-27 09:45:11 -03:00
Swag McYolosteinen
7ee2317ec3 Merge pull request #6207 from phil235/RecursiveHearVisibleMessage 
Mob inside something can now see visible_message()'s
 2014-12-27 13:20:50 +01:00
Cheridan
cededeaa8e Merge pull request #6498 from as334/MobReactions 
Allows chemical reactions inside mobs
 2014-12-27 01:20:18 -06:00
as334
8a9d7b12c4 Change the spacing.-For Cheridan 2014-12-27 02:09:07 -05:00
as334
a3e70b3cf2 Prevents certain chemical reactions occuring in mobs. 2014-12-27 01:38:31 -05:00
paprka
87d0cbdb2b Merge branch 'master' of https://github.com/tgstation/-tg-station into fixescargo 
Conflicts:
	code/modules/clothing/head/helmet.dm
 2014-12-26 22:31:54 -08:00
paprka
5fb8ae35b4 removes tactical helmets 2014-12-26 22:30:24 -08:00
tkdrg
45904bb8a2 Merge pull request #6425 from JJRcop/OOCemoji 
Adds emoji to OOC chat [Now with in-house sprites!]
 2014-12-27 03:01:36 -03: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
Remie Richards
82588d43bf Merge pull request #6347 from Xhuis/bzzzt 
Shocking animations
 2014-12-27 05:23:09 +00:00
Xhuis
9ba34b32e6 Fixes return() borking the code 2014-12-27 00:17:57 -05:00
paprka
ef1d60061b fixes ai turrets having disabler modes 2014-12-26 20:52:21 -08:00
paprka
19f9da1a99 disabler now makes a sound when it hits 2014-12-26 20:29:52 -08:00
paprka
109be766d6 fixes a few bugs 2014-12-26 19:23:22 -08:00
tkdrg
8acded6304 Merge pull request #6278 from Ergovisavi/muh_mobs 
Mob faction cleanup / Some goliath changes / Hopefully fixing some lag
 2014-12-26 23:23:48 -03:00
Xhuis
f07b250dde Removes old comments and does damage immediately 2014-12-26 21:08:43 -05:00
Remie Richards
344142634e Merge pull request #6518 from TZK13/Chocolate-Food 
Adds three new food items made with chocolate bars
 2014-12-27 00:55:42 +00:00
Remie Richards
17f1e7f044 Merge pull request #6516 from paprka/suitcensorsv2v2 
Tweaks suit sensor menu to be easier to use
 2014-12-27 00:37:47 +00:00
tkdrg
188b85ae48 Merge pull request #5641 from MrPerson/autoghosting 
Moving while dead causes you to ghost
 2014-12-26 21:35:58 -03:00
paprka
615f3f3488 Merge branch 'master' of https://github.com/tgstation/-tg-station into getshockednerd 
Conflicts:
	code/modules/mob/living/damage_procs.dm
	code/modules/projectiles/projectile.dm
 2014-12-26 16:14:19 -08: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
Cheridan
efa27af9f4 Merge pull request #6567 from tkdrg/verboten 
Reinstates bomb capping on Supermatter shard explosions
 2014-12-26 16:30:21 -06:00
Cheridan
71385308de Merge pull request #6387 from Incoming5643/goodbye_my_children 
Magic Mania 1.8: Summon Spells Rework and The Challenge System
 2014-12-26 16:29:36 -06:00
Cheridan
08d36580ba Merge pull request #6561 from paprka/manifestfixes 
Expands the new player options menu
 2014-12-26 13:22:24 -06: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
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
phil235
8a56892892 Fixes message typos in silicon punch message, mecha construction description, message when taking blood sample. 2014-12-26 12:13:54 +01: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
7445f27348 Merge pull request #6546 from Menshin/ian_place_hat_fix 
Fixes runtime when usrless placing an item on Ian's head
 2014-12-25 21:26:55 -08:00
hornygranny
dbaa0ca291 Merge pull request #6542 from phil235/SoreThroatFix 
Fixes getting sore throat messages while dead.
 2014-12-25 21:26:38 -08:00
hornygranny
41bf34aee2 Merge pull request #6530 from paprka/consistentbs 
Makes space suit/hardsuit suit storage consistent (oxy tanks)
 2014-12-25 21:26:22 -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
tkdrg
adb8989327 Nerfs the supermatter explosion back to 3, 7, 14 
Request by a headcoder and a server host.
 2014-12-25 19:47:36 -03:00
Cheridan
068adcb4da Merge pull request #6545 from tkdrg/runtimes-killed-santa 
Fixes christmas event runtime
 2014-12-25 16:20:45 -06: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
Cheridan
a75b1e1f22 Merge pull request #6340 from Menshin/fabricators_polishing 
Autolathe revamp and sub-menus for fabricators
 2014-12-25 16:11:54 -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
Menshin
cf41dab26f Conflict fixing 2014-12-25 22:34:40 +01: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