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

6724 Commits

Author SHA1 Message Date
phil235
16ea9974d9 Fix the empty msg of reagent dispenser not making it clear that it cannot be refilled. 2014-11-24 19:49:34 +01:00
hornygranny
a969dee533 Merge pull request #5996 from Razharas/VendRun 
Simple fix for brand intellegense runtime
 2014-11-23 15:34:40 -08:00
Razharas
eabea41f4d Merge pull request #5989 from Menshin/cables_cutting_fix 
Fixes cutting cables always spawning a single red cable
 2014-11-23 23:35:21 +03:00
Remie Richards
eead810fcc Merge pull request #5875 from phil235/RevolverMalfFix 
Fixes the modified detective revolver blowing up with empty chamber
 2014-11-23 15:11:28 +00:00
Remie Richards
3011261e7f Merge pull request #5980 from Menshin/collectors_anchoring_fix 
Radiations collectors anchoring fix
 2014-11-23 15:02:28 +00:00
Remie Richards
5e6d0c9994 Merge pull request #5979 from tkdrg/grabthewood 
Fixes wood duplicating exploit with bookcase
 2014-11-23 15:00:11 +00:00
Cheridan
51b6253315 Merge pull request #5964 from phil235/ViroFix1 
Fixing viruses not working.
 2014-11-23 00:56:29 -06:00
phil235
3a97e8d878 Fixes not being able to have more than one virus. (two typos fixed) 2014-11-22 18:30:19 +01:00
Razharas
343e2ca1f5 Simple fix for brand intellegense runtime 
Should fix #5672
 2014-11-22 20:09:19 +03:00
Menshin
56bd52e95b Fixed cutting cables always spawning a single red cable 2014-11-22 15:59:18 +01:00
Razharas
ebeb3367c2 Merge pull request #5938 from hornygranny/piperuntimes 
disposals fixes
 2014-11-22 14:50:42 +03:00
tkdrg
64e5f0b6b9 Fixes wood duplicating exploit with bookcase 2014-11-21 20:54:29 -03:00
Menshin
c2cfa31d87 Make collectors actually connect to the powernet when wrenched down. 2014-11-22 00:32:52 +01:00
Cheridan
6ec91732c8 Merge pull request #5911 from Razharas/MechFix 
Microwave message fix, small and lazy
 2014-11-21 10:53:09 -06:00
Cheridan
448d0fab7f Merge pull request #5913 from tkdrg/yearslater 
Makes cyborg modules NODROP
 2014-11-21 10:17:53 -06:00
hornygranny
b2fba4a48f Merge pull request #5944 from Jordie0608/orangeslikesgoatbutts 
Fixes select job equipment cancel
 2014-11-20 11:21:13 -08:00
Cheridan
a1efd6cfde Merge pull request #5946 from tkdrg/tktp 
Fixes TK teleporting pictures and growns
 2014-11-20 13:05:11 -06:00
Cheridan
0da09e3f6b Merge pull request #5557 from Incoming5643/magicmania1.76 
Magic Mania 1.76: Lets outrun the feature freeze
 2014-11-20 09:07:41 -06:00
Cheridan
8bfed4258b Merge pull request #5922 from Steelpoint/BeretHoS 
HoS Beret + Warden Drill Hat
 2014-11-19 10:26:27 -06:00
Cheridan
1208c48af3 Merge pull request #5652 from Menshin/atmos_z_level_fix 
Atmos z level fix + radio controller code sanitization
 2014-11-18 17:05:14 -06:00
Cheridan
c98448b5c2 Merge pull request #5650 from phil235/MechAtkFix1 
All mechs get a melee attack
 2014-11-18 12:53:52 -06:00
tkdrg
0db30a6534 Fixes issues with TK teleporting pictures and harvested plants. 2014-11-18 15:49:03 -03:00
Jordie0608
ce6a1d0d89 Fixes select job equipment cancel 2014-11-18 22:50:33 +11:00
Razharas
87fe5489a7 Merge pull request #5701 from tkdrg/outoftheleftfield 
Containment fiels bounce structure, machinery & mechs, take two
 2014-11-18 04:39:48 +03:00
Razharas
59aa177af7 Merge pull request #5681 from Menshin/singulo_beacon_fix 
Singularity beacon fix and clean-up
 2014-11-18 04:19:00 +03:00
hornygranny
1111c9caa7 Merge pull request #5915 from tkdrg/hugs 
Fixes a couple facehugger bugs
 2014-11-17 11:38:57 -08:00
Cheridan
53d913bc7f Merge pull request #5924 from tkdrg/junk 
Removes unticked unused code from the tree
 2014-11-17 13:34:49 -06:00
Hornygranny
2374eb9720 fixes disposals flushing their stored construct 
fixes an atmos runtime
fixes a disposal pipe runtime
 2014-11-17 11:30:33 -08:00
Remie Richards
2138e1d2c7 Merge pull request #5884 from tkdrg/ionblastUSA 
Moves the ion law picklists to an external txt
 2014-11-17 09:48:04 +00:00
tkdrg
608dec814e Removes old/unused code from the tree. Use version control if you need it for some reason. 2014-11-16 16:53:18 -03:00
tkdrg
0f28c013ff Makes cyborg modules NODROP 2014-11-16 15:59:57 -03:00
Steelpoint
03a98a6295 HoSBeret 2014-11-16 22:32:01 +08:00
tkdrg
e05dbe3b27 Fixes facehuger bugs 2014-11-16 03:26:27 -03:00
hornygranny
509c07650f Merge pull request #5802 from paprka/EATITFATTY 
Clothing sprite/file path changes
 2014-11-15 20:28:43 -08:00
hornygranny
ac6d5b9558 Merge pull request #5861 from tkdrg/moarfloors 
Floor refactor MkII
 2014-11-15 20:13:50 -08:00
Razharas
5f13ae6e97 Microwave message fix, small and lazy 
ALso misleading branch name
 2014-11-16 07:07:59 +03:00
Incoming
4a4b39b57f fixes the spider pathing 2014-11-15 14:55:48 -05:00
Incoming
fbbc77f905 Merge branch 'master' of https://github.com/tgstation/-tg-station into magicmania1.76 
Conflicts:
	code/modules/projectiles/projectile/magic.dm
 2014-11-15 14:44:51 -05:00
Razharas
24c0c3d941 Merge pull request #5889 from Aranclanos/phazonchassis 
Fixes phazon chassis availability in the mech fabricator
 2014-11-15 20:39:36 +03:00
Razharas
2ec1658be0 Merge pull request #5735 from phil235/StingMiddleClickRuntimeFIx 
Moving carbon/middleclickon() form carbon.dm to click.dm
 2014-11-15 02:51:24 +03:00
Cheridan
8202db4227 Merge pull request #5755 from Miauw62/bughl 
Fixes grinders opening their menus on range.
 2014-11-14 14:50:46 -06:00
Remie Richards
2f57a8980a Merge pull request #5804 from TZK13/Preferences-Setup-Fixes-2 
Fixes the previews in the character setup screen again
 2014-11-14 18:29:17 +00:00
tkdrg
77a6df36f7 Merge remote-tracking branch 'upstream/master' into moarfloors 
Conflicts:
	_maps/map_files/MetaStation.v39K.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/machinery/bots/floorbot.dm
 2014-11-14 15:23:35 -03:00
Remie Richards
935775bfc1 Merge pull request #5788 from Miauw62/runtime2 
Fixes some AI traitorize runtimes.
 2014-11-14 18:12:50 +00:00
Remie Richards
17607d0aa2 Merge pull request #5776 from MrPerson/throwing_changes 
Throwing bugfixes
 2014-11-14 18:04:00 +00:00
Aranclanos
02d18de52a Fixes phazon chassis availability in the mech fabricator, they were missing. 2014-11-14 14:45:38 -03:00
Menshin
ec944abfc6 * limit atmos/fire alerts to the current z_level 
* atmos/fire alerts are now linked to an object and not its area, as intended
* simplified and full pathed the radio frequency datum
* made radio objects properly clean on del/qdel, instead of letting the radio controller remove nulls at each post_signal()
 2014-11-14 10:10:45 +01:00
paprka
bf20961a41 fixes a grammarical error 2014-11-13 21:13:55 -08:00
paprka
ec6b2424d2 purge the unused 2014-11-13 21:10:53 -08:00
paprka
40cdf3ffec swat mask overhauls and such 2014-11-13 18:36:30 -08:00