cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 02:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,164 Commits 62 Branches 14 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

2293 Commits

Author SHA1 Message Date
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
KorPhaeron
83f4661f05 Missing checks 2015-12-30 10:28:27 -06:00
duncathan
4e22cb20ac further listmos optimizations + documentation 2015-12-30 09:52:07 -06:00
Okaw
92c125cf05 Changing bartender shoes icon to "laceups" 
For fancy bartending.
 2015-12-30 10:08:39 -05:00
duncathan
8392974ad0 fixes associative list; adds gas_overlay to "datum gases" 2015-12-29 22:50:09 -06:00
tkdrg
ffd5374fe1 Merge pull request #14128 from KorPhaeron/offer_control 
Offer control improvements
 2015-12-29 22:43:36 -03:00
Melichior
53db2cbcd1 Fixed 'in' precedence errors. 2015-12-29 17:16:09 -07:00
tkdrg
ab7a3837d9 Merge pull request #14121 from AnturK/martialfix 
Makes martial arts reset combos on target change.
 2015-12-29 20:09:32 -03:00
Razharas
356ec745c1 Merge pull request #13787 from Chnkr/revert-13643-Robocop 
Revert "changes robocop law priority"
 2015-12-30 00:44:36 +03:00
duncathan
362c61f410 "datum gases" 2015-12-29 14:44:47 -06:00
duncathan salt
42d10a22d3 Merge pull request #13926 from Bawhoppen/czechmilitary 
Tactical Gear + small changes
 2015-12-29 20:43:14 +01:00
duncathan
17f167bcb7 associative list 2015-12-29 13:33:12 -06:00
KorPhaeron
9bcca100ca Lesser Summon Guns 2015-12-29 10:58:27 -06:00
PKPenguin321
d7a9d4d35f lowers thermals TC cost 
From 6 to 4
 2015-12-29 00:50:06 -08:00
AndrewJacksonThe2nd
629863fbae fixes 2015-12-28 23:10:28 -08:00
AndrewJacksonThe2nd
081aa7099e Removes Frame, fixes 2015-12-28 16:31:30 -08:00
KorPhaeron
759646af68 Improvements 2015-12-28 17:29:46 -06:00
AndrewJacksonThe2nd
799a406af4 New Frame Objective, compile fixes 2015-12-28 15:23:42 -08:00
AndrewJacksonThe2nd
dca91323a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into objectives_rework 
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/objective.dm
	data/mode.txt
 2015-12-28 12:40:51 -08:00
AnturK
cfe47257b2 Makes martial arts reset combos on target change. 2015-12-28 21:33:40 +01:00
duncathan
cc9c5768ca Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	code/datums/gas_mixture.dm
 2015-12-28 13:59:16 -06:00
duncathan
aa2840015b Merge branch 'listmos' of https://github.com/MrStonedOne/-tg-station into MrStonedOne-listmos 
Conflicts:
	code/datums/gas_mixture.dm
 2015-12-28 13:40:27 -06:00
duncathan
a64b68f76c caches gases in more procs 2015-12-28 13:32:49 -06:00
MrStonedOne
5115807a55 fixes listmos a bit 2015-12-28 11:23:15 -08:00
tkdrg
eed4e4e5fe Merge pull request #13860 from LanCartwright/plasmaknucklesandwich 
Fixes Plasma Fist fighting style
 2015-12-28 14:37:46 -03:00
tkdrg
e88bf4e2b5 Merge pull request #14084 from MrStonedOne/GOOOOOF 
Upgrades do_after and progress bars.
 2015-12-28 14:35:34 -03:00
LanCartwright
a4977e3e2d fixes drunk typo 2015-12-28 17:06:27 +00:00