cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 05:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,787 Commits 61 Branches 14 Tags
03e1d0d60a934b75832af18e2fb839995db6cdcd
Commit Graph

4127 Commits

Author SHA1 Message Date
Cheridan
03e1d0d60a -Adds firing pin box define 
-Examining a gun now shows its pin
-You can now emag a firing pin to make it function without checks.
-Loyalty pins unable to be constructed
 2015-01-12 21:21:34 -06:00
Cheridan
0956a86c22 Firing Pin System - The Lockbox Solution 2015-01-09 18:49:02 -06:00
tkdrg
40e5476a53 Merge pull request #6598 from Incoming5643/InstantSummons 
Magic Mania 1.81: Instant summons!
 2015-01-09 03:29:15 -03:00
tkdrg
69280f6b9b Merge pull request #6879 from dannno/bandolier 
Adds shotgun bandoliers
 2015-01-08 22:47:09 -03:00
hornygranny
56bad0f7ce Merge pull request #6747 from paprka/gunchangesv2baby 
Further changes to the ranged stun system
 2015-01-08 16:09:37 -08:00
tkdrg
567755d798 Merge pull request #6836 from Boggart/holosignfix 
Fixes the holosign projector making signs when put into storage. (can_be_placed_into refactor)
 2015-01-08 16:04:49 -03:00
dannno
cdc01c68df remove unnecessary shiet 2015-01-07 23:23:34 -05:00
dannno
c76072608a bamboliers 2015-01-07 20:28:16 -05:00
Boggart
e0a968f151 Fixes the holosign projector making signs when put into storage, generalizes can_be_placed_into and improves the check in objects that use it. 2015-01-07 01:09:58 -07:00
phil235
be6532b825 Fixing a few things in statue's attackby 2015-01-06 16:26:16 +01:00
tkdrg
234e5bd64c Merge pull request #6811 from paprka/spessbuckle 
Fixes chair/bed buckle message
 2015-01-06 04:38:48 -03:00
Remie Richards
005d79073a Merge pull request #6731 from tkdrg/ntrc_strikes_back 
Adds an "unread message count" to the NTRC link
 2015-01-06 07:22:45 +00:00
Remie Richards
b798df68ab Merge pull request #6790 from tkdrg/ExhaustedPlumpCamel 
Fixes a few RPD painting bugs
 2015-01-06 07:20:28 +00:00
tkdrg
931f75b7e8 Merge pull request #6779 from TZK13/Crayon-Body-Outlines 
Adds a new body outline graffiti for crayons and gives the detective a white crayon
 2015-01-06 04:18:21 -03:00
paprka
f0712db606 Merge branch 'master' of https://github.com/tgstation/-tg-station into gunchangesv2baby 
Conflicts:
	code/modules/projectiles/guns/energy/stun.dm
 2015-01-05 18:43:46 -08:00
Xhuis
8f42d43b04 Merge remote-tracking branch 'remotes/upstream/master' into knife_fix 2015-01-05 21:35:05 -05:00
Xhuis
a5c9a7292f Makes butcher's cleaver a child of kitchen knife 2015-01-05 17:23:03 -05:00
carnie
281df385a2 Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems 2015-01-05 19:52:03 +00:00
Ergovisavi
7a83165f2b Merge pull request #6773 from phil235/ShadeBuckleFix 
Fixes simple animals not being able to unbuckle themselves.
 2015-01-05 10:45:13 -08:00
paprka
39f27a07e2 fixes buckle message 2015-01-04 21:56:50 -08:00
tkdrg
4e84fb2eef Changes a missed del() to qdel() 2015-01-04 16:22:27 -03:00
Xhuis
e7a9a0bdfc Makes the butcher cleaver a normal-sized item 2015-01-04 14:21:27 -05:00
phil235
6c156f5218 Merge pull request #6774 from psykzz/patch-2 
Fixing desc to show max cap of the RCD
 2015-01-04 15:04:45 +01:00
phil235
d79c6fe929 Merge pull request #6617 from Firecage/Statue_Fixes 
Statue fixes
 2015-01-04 13:53:45 +01: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
carnie
a3f5e7ebfd Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems 
Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2015-01-04 01:52:14 +00:00
paprka
8527f23d85 Merge branch 'master' of https://github.com/tgstation/-tg-station into gunchangesv2baby 2015-01-03 17:05:27 -08:00
Matt Smith
50a7f76f18 derp'd with the names 2015-01-04 00:36:04 +00:00
Matt Smith
fb4e1c56c2 Update RCD.dm 2015-01-04 00:32:37 +00:00
Matt Smith
585971270a moved and renamed variable 2015-01-03 23:49:03 +00:00
Matt Smith
c227ebefe8 Updated base object and fixed missing line. 2015-01-03 23:48:21 +00:00
Incoming
69aea446a3 Fixes conflicts 
Adds handling for canister teleportation shinanagans
Refactors nozzles slightly so they act properly if someone manages to swipe the tank without it ever touching the floor
 2015-01-03 17:15:08 -05:00
TZK13
18e4cec460 Adds a new body outline graffiti for crayons, gives the detective a white crayon, changes the sprite for the mime crayon, and puts a waistcoat in the detective's closet. 2015-01-03 13:44:23 -06:00
Matt Smith
19ad927d4f Fixing desc to show max cap of the RCD 
Was hard coded to show 30, moving it to a variable and actually making use of it.
 2015-01-03 16:48:43 +00:00
phil235
6d6547467a Fixes simple animals not being able to unbuckle themselves. 
Fixes pet slime. There's no longer two types of adult pet slimes, simplifying adult pet slime's Die() proc.
Fixing some absolute path in slime/slime.dm
 2015-01-03 14:35:14 +01:00
TZK13
bf5bddf0c7 Merge branch 'master' of https://github.com/tgstation/-tg-station into Socks 
Conflicts:
	config/admins.txt
 2015-01-03 07:07:03 -06:00
phil235
1153ef4700 Merge pull request #6651 from paprka/tablesandwindowsbaby 
Fixes shuttle windows smoothing with normal windows
 2015-01-03 00:22:29 +01:00
paprka
ad5872e84f fixes window junction update to use initial icon state 2015-01-02 15:14:36 -08: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
paprka
46ee047404 further changes to the ranged stun system 2015-01-01 22:22:03 -08:00
tkdrg
38acdca156 Merge pull request #6713 from phil235/DicerollRuntimeFix 
Fixes runtime linked to diceroll proc
 2015-01-01 16:58:39 -03:00
tkdrg
6a0f1be7cd Merge pull request #6584 from phil235/HoloSwordFix 
Fixes being able to smash grille/newscaster/mirror/lights with holo esword
 2015-01-01 16:39:16 -03:00
tkdrg
56a1d11162 Adds an "unread message count" to the NTRC link 
Fixes #6720
 2015-01-01 13:54:52 -03:00
Swag McYolosteinen
17c81726ce Merge pull request #6722 from tkdrg/holytitsmergethis 
[HOLY TITS MERGE THIS] Fixes Hulk server crash bug and also a couple typos
 2015-01-01 13:41:35 +01: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
371b66a334 Merge pull request #6678 from paprka/nitrile 
Adds nitrile gloves
 2015-01-01 00:29:04 -03: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