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

4194 Commits

Author SHA1 Message Date
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
Cheridan
6c9fa9eb72 Merge pull request #14389 from phil235/VisibleMessageRefactor 
Refactor the visible_message() proc to be faster in some cases.
 2016-01-09 22:16:57 -06:00
tkdrg
990efcbb7a Merge pull request #14526 from KorPhaeron/virus 
Fixes virus grenade kit being empty
 2016-01-09 18:40:58 -03:00
KorPhaeron
a35cdae739 Fixes grenade kit as well 2016-01-08 16:03:17 -06:00
KorPhaeron
b6474aa48f virus 2016-01-08 15:58:35 -06:00
tkdrg
6c41d0e437 Merge pull request #14468 from KorPhaeron/fuck_off_already 
Stops defibs/cloners notifying suicides when people are trying to revive them
 2016-01-08 18:09:29 -03:00
KorPhaeron
1ce90959ef Notify 2016-01-06 22:40:50 -06:00
SouDescolado
783e669c2d Fixes Tuberculosis kit 
Name was wrong
 2016-01-06 15:52:38 -02:00
SouDescolado
3b257854f0 Merge pull request #1 from tgstation/master 
Merge shit
 2016-01-05 14:44:37 -02:00
SouDescolado
92b3c84a22 Make the code beautiful 
Less lines, same code.

Trying to fix merge conflict.

Gah
 2016-01-05 14:36:39 -02:00
tkdrg
de09f8ee0b Merge pull request #14306 from MrStonedOne/patch-114 
Makes pda cartridges use proper type safety.
 2016-01-05 05:21:51 -03:00
Aranclanos
a9ef05807e Merge pull request #14362 from Bawhoppen/czechbarmanhelp 
Gives barman back his new gear
 2016-01-05 04:52:21 -03:00
Kyle Spier-Swenson
3c5cdbefe3 forgot to typecast properly 2016-01-04 23:42:45 -08: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
Cheridan
797bfe01ef Merge pull request #14391 from neersighted/tgui_followup 
Fix tgui proc signatures and thus AI APC reboot
 2016-01-04 17:06:52 -06:00
KorPhaeron
8b08ce8a6b Better loop 2016-01-04 16:48:11 -06:00
Bjorn Neergaard
aec6bc103c Fix tgui proc signatures and thus AI APC reboot 
This allows state overloading

Make AI reboot code use ui_interact instead of attack_ai
Fixes #13762
 2016-01-04 16:25:20 -06:00
phil235
e225fbc850 - Refactor the visible_message() proc to be much faster. 
- Replacing some "for(var/mob/o in viewers()) show_message()" by "visible_message()".
- Replacing some "show_message()" by " << "..." " instead.
- Fixes being able to see the results of the health and slime analyzers while blind.
-
 2016-01-04 22:49:27 +01:00
duncathan salt
748e2e3485 Merge pull request #14345 from AnturK/mapjectors 
Fixes injectors spawned before mutation table is ready
 2016-01-04 20:21:48 +01:00
duncathan salt
777302afa5 Merge pull request #14346 from AnturK/chambutts 
Restores default chameleon projector disguise
 2016-01-04 20:20:59 +01:00
Lularian
cb50a25772 gives barman his cool stuff again 2016-01-03 19:35:49 -06:00
bawhoppen
3543175c51 Revert "fixes attempt two" 2016-01-03 19:05:52 -06:00
tkdrg
473eb8291e Merge pull request #14216 from Bawhoppen/czechfixes2 
fixes attempt two
 2016-01-03 21:02:20 -03:00
Lularian
f5bc4b6b4f woops 2016-01-03 17:50:20 -06:00
MrStonedOne
5d86ed49f6 Merge conflic fix 2016-01-03 14:51:14 -08:00
AnturK
bbaca08f74 Restores default chameleon projector disguise 2016-01-03 19:19:17 +01:00
AnturK
ff6d88f4e6 Fixes injectors spawned before mutation table is ready 2016-01-03 18:49:10 +01:00
Razharas
10b74eb793 Merge pull request #14174 from Buggy123/Buggy123-IEDBUFF2 
Buffs IEDS 2: electric boogaloo
 2016-01-03 13:17:42 +03:00
KorPhaeron
8a72f5a55c Fixes cyborg teleport 2016-01-03 04:11:19 -06:00
Aranclanos
e6d9711892 Merge pull request #14272 from KorPhaeron/AI_fix 
Fixes borgs not getting 0 law, ion laws, etc
 2016-01-03 02:19:22 -03:00
Aranclanos
ca5f29b56c Merge pull request #14223 from KorPhaeron/tank 
Fixes tank default release
 2016-01-03 01:22:19 -03:00
MrStonedOne
b50e8d2a63 removes a bunch of unneeded spawns 
spawns have a high overhead.

I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
 2016-01-02 18:23:02 -08:00
Razharas
fd390009c7 Merge pull request #14252 from tkdrg/cablefix 
Fixes cable_coil children not merging each other
 2016-01-03 04:38:52 +03: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
Kyle Spier-Swenson
64fc9ffc4c Removes some : in cartridge code 2016-01-02 15:14:34 -08:00
Cheridan
cfbe48fc61 Merge pull request #14264 from AnturK/chamfix 
Fixes chameleon projector ignoring closets
 2016-01-02 16:37:40 -06:00
Cheridan
32f1dc2c9d Merge pull request #14258 from arty23/patch-5 
M90gl dufflebag grammar fixed
 2016-01-02 16:23:50 -06:00
tkdrg
2e25b27041 Merge pull request #14250 from AnturK/burningtables 
Fixes extinguishing burning structures
 2016-01-02 13:53:30 -03:00
Bjorn Neergaard
777ba0486d Rename the tgui pref and adjust all UI sizes for the rewrite 2016-01-01 17:47:45 -06:00
Bjorn Neergaard
a2bb279164 NanoUI is now 'tgui' 2016-01-01 17:47:44 -06:00
Bjorn Neergaard
dc9db90064 Add interfaces 
* Add tanks interface
* Add canister interface
* Add chem heater interface; wrap long template lines
* Add chem dispenser interface
* Add section header buttons
 2016-01-01 17:45:58 -06:00
KorPhaeron
d25c62fd53 Fixes AI lawsync 2016-01-01 17:28:52 -06:00
AnturK
45912423df Makes champrojector use appearance 2016-01-01 21:35:14 +01:00
AnturK
99f56abe38 Fixes chameleon projector ignoring closets 2016-01-01 21:23:04 +01:00
arty23
0e23fdee89 M90gl dufflebag grammar fixed 
Issue reported by LanCartwright.
 2016-01-01 12:46:23 -06:00
Tkdrg
94752caf4a Fixes cable_coil children not merging each other 
Fixes #14240
 2016-01-01 12:44:04 -03:00
AnturK
1ee0c1cbba Buffs Dihydrogen monoxide 2016-01-01 15:17:29 +01:00
AnturK
907083e071 Fixes extinguishing burning structures 2016-01-01 14:55:34 +01:00
Tkdrg
0b40fe620f Merge remote-tracking branch 'LanCartwright/FIXESBOX' into HEAD 
Closes #14225
 2015-12-31 21:37:12 -03:00
Akke
6f47f9b5ee fixes items spawning in nullspace 2016-01-01 00:34:57 +00:00