cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 00:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,016 Commits 61 Branches 14 Tags
fa8cc5cd12ffee32662ddd413f1f80f4ced7e794
Commit Graph

2169 Commits

Author SHA1 Message Date
Razharas
28ac3268d1 Merge pull request #14660 from Menshin/flappyflaps 
Generalized CanAStarPass() to all /obj
 2016-01-17 15:33:39 +03:00
Menshin
828c1ddf2c * Generalized AStar check for objects preventing passability 
* Fixed AStar not detecting plastic flaps as impassable for mobs that can't pass them (fixes #14616)
 2016-01-16 15:27:31 +01:00
Nerd Lord
9455ace7b0 Fixes a few more incurable diseases 2016-01-15 14:23:23 -05:00
Nerd Lord
35f51004af Fixes dna spread virus being impossible to cure 2016-01-15 14:19:42 -05:00
Razharas
4aea0db29b Merge pull request #14120 from duncathan/listmos 
[READY] Listmos & "Datum Gases"
 2016-01-15 11:58:05 +03:00
Buggy123
033aa5d7b0 Update construct_spells.dm 
Update soulstone.dm

Update constructs.dm

Update construct_spells.dm

Plz compile

Plz

Compile

Update construct_spells.dm

Update soulstone.dm

Update soulstone.dm

Sarawak

Update soulstone.dm

Update soulstone.dm

Update soulstone.dm

Update soulstone.dm

Update soulstone.dm

Update soulstone.dm

Update soulstone.dm

Update soulstone.dm

Update constructs.dm

Update constructs.dm

YES! YES! YES!

Update soulstone.dm
 2016-01-14 17:32:49 -05:00
duncathan
e20eee52ad fixes reconcile_air(); makes gas flow properly through pipes 2016-01-14 14:02:01 -06:00
duncathan
9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract
 2016-01-13 20:07:21 -06:00
duncathan
d5086b27b4 fixes space superheating and air canisters not updating icons 2016-01-13 19:22:18 -06:00
Tkdrg
5589ac7559 Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework" 
This reverts commit 52a45b6292, reversing
changes made to 19b43ba668.

Conflicts:
	code/datums/mind.dm
 2016-01-07 23:15:35 -03:00
hornygranny
deb5405d5b Merge pull request #14459 from KorPhaeron/fusion 
Temporary Revert Of Fusion
 2016-01-07 13:13:09 -08:00
KorPhaeron
ff09481e5e LSG 2016-01-07 01:48:50 -06:00
KorPhaeron
87b889ca76 Fusion 2016-01-06 18:36:49 -06:00
duncathan salt
50ebfa0f17 Merge pull request #14395 from MrStonedOne/nomoreminus1 
Removes a bunch of sleep(-1) and spawn(-1) from the code
 2016-01-05 22:16:17 -06:00
Aranclanos
3108162f1d Merge pull request #14308 from tgstation/duncathan-patch-1 
Cancelling while adding a custom objective no longer adds a free objective
 2016-01-05 04:39:09 -03:00
duncathan salt
ede4a3b378 Merge pull request #14335 from KorPhaeron/refunds 
Uplink refund refactor/fixes cyborg spawners not appearing in nuke purchase log
 2016-01-05 01:11:26 +01:00
MrStonedOne
fd80575f38 Removes a bunch of sleep(-1) and spawn(-1) from the code 
This seems to be causing issues where if the queue was too long, byond would attempt to process through all of it while hanging everything else.
 2016-01-04 15:17:12 -08:00
duncathan salt
421ecbeb9f Merge pull request #14323 from Shadowlight213/Mindattacklog 
Fixes VV attack logs being lost on cloning and body destruction and made gibbed antags show in check antags.
 2016-01-04 20:31:37 +01:00
duncathan salt
94b003f7a7 Merge pull request #14339 from AnturK/cleaning 
Removes some unused code
 2016-01-04 20:20:18 +01:00
duncathan salt
9ee0f50cd9 Merge pull request #14285 from neersighted/tgui_followup 
tgui followup
 2016-01-03 18:00:43 +01:00
AnturK
89b612ad15 Removes unused ?module? code 2016-01-03 14:55:18 +01:00
KorPhaeron
8a72f5a55c Fixes cyborg teleport 2016-01-03 04:11:19 -06:00
Shadowlight213
5662676e5e Makes attacks also log to the mob's mind.dm 
Shows gibbed antags in the check antags panel.
 2016-01-02 17:20:19 -08:00
duncathan
b18c6c2c5c Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	nano/assets/nanoui.js
	nano/bower.json
	nano/templates/atmos_filter.dot
 2016-01-02 18:02:54 -06:00
duncathan salt
f1783bceca fix #14307 2016-01-02 17:45:30 -06:00
duncathan
178a8987a7 fixes superheating; makes gas flow 2016-01-02 17:11:51 -06:00
tkdrg
e652999962 Merge pull request #14251 from AnturK/beamloc 
Fixes beam loc bug
 2016-01-02 13:51:37 -03:00
Bjorn Neergaard
85b1576ba0 Sanitize HTML in VV to prevent HTML injection 
Also rename SStgui html variable to be more informative
 2016-01-01 18:41:39 -06:00
Bjorn Neergaard
a2bb279164 NanoUI is now 'tgui' 2016-01-01 17:47:44 -06:00
AnturK
b0827ea710 Fixes beam loc bug 2016-01-01 15:23:05 +01:00
duncathan salt
397025b292 Merge pull request #14074 from MrStonedOne/HOLYFUCKINGGHOSTPOPUPS 
[ready]Ghost popup re-work
 2015-12-31 23:58:03 +01:00
duncathan
75aab7e2ec optimizations and fixes 2015-12-31 15:44:27 -06:00
Tkdrg
70ba1a24f5 Merge branch 'AnturK-manifesto' into HEAD 
Closes #14173
 2015-12-31 18:35:10 -03:00
tkdrg
28ca4ec1be Merge pull request #14167 from okaw/newshoes 
Changing bartender security icon + shoes to laceups
 2015-12-31 16:14:15 -03:00
tkdrg
f64392a8cd Merge pull request #14166 from KorPhaeron/ghosts 
Fixes offer control to ghosts not working on mindless mobs
 2015-12-31 15:07:58 -03:00
MrStonedOne
ba660d98ba Some minor ghost popup fixes 2015-12-31 02:23:53 -08:00
MrStonedOne
69a70daebd Ghost popup part 2: The didn't do much-a-ning 
Fixes button3, does the remie
 2015-12-31 01:54:15 -08:00
tkdrg
52a45b6292 Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework 
OBJECTIVES REWORK: Better Objectives Generation
 2015-12-31 03:11:41 -03:00
tkdrg
da97c0fb58 Merge pull request #14107 from LanCartwright/newvirogrenades 
Viro-terror grenade renovation
 2015-12-31 00:04:38 -03:00
tkdrg
4485cc3dfb Merge pull request #14146 from KorPhaeron/guns 
Lesser Summon Guns
 2015-12-30 23:32:13 -03:00
LanCartwright
f9aa12d190 excludes virus kits from nuke 2015-12-31 02:22:51 +00:00
LanCartwright
023f606406 Update uplink_item.dm 2015-12-31 02:20:35 +00:00
LanCartwright
afadb0bbec typo 2015-12-31 02:12:18 +00:00
KorPhaeron
504926883f Cleans up code 2015-12-30 20:10:15 -06:00
LanCartwright
3e10ee04f6 god dammit 2015-12-31 01:54:49 +00:00
tkdrg
51a28ab055 Merge pull request #14159 from somnium13/fix-in-prec 
Fixes 'in' operator precedence issues.
 2015-12-30 22:38:13 -03:00
Akke
11a3cb3d82 indentation 2015-12-30 23:30:55 +00:00
AnturK
65bcef04ea makes manifest entries use get_flat_human_icon 2015-12-30 23:47:37 +01:00
AndrewJacksonThe2nd
0121f6691f fixes 2015-12-30 13:14:28 -08:00
tkdrg
17e495f4cf Merge pull request #14142 from PKPenguin321/patch-6 
Lowers thermals TC cost
 2015-12-30 15:18:28 -03:00