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

6770 Commits

Author SHA1 Message Date
tkdrg
fa8cc5cd12 Merge pull request #14669 from xxalpha/shingles 
Objects under rwindows don't break.
 2016-01-17 17:30:57 -03:00
xxalpha
6d56fafa1c fasdasdjaidfhasiufh 
conflix

fuck that

mistake

Clearer if
 2016-01-17 20:14:02 +00:00
xxalpha
e4150ac88e Merge remote-tracking branch 'upstream/master' into shingles 2016-01-16 18:37:40 +00:00
xxalpha
6ff3817a89 Repath windows (oh god), nerf normal windows ex_act. 2016-01-16 18:27:16 +00:00
xxalpha
2cc55c3ba0 Changed floor ex_act to not break grilles & src if under r-windows. 2016-01-16 17:43:33 +00: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
Razharas
4aea0db29b Merge pull request #14120 from duncathan/listmos 
[READY] Listmos & "Datum Gases"
 2016-01-15 11:58:05 +03:00
duncathan salt
bcdb01caba Merge pull request #14557 from Buggy123/patch-1 
Graffiti no longer explicitly stated to be drawn with crayons.
 2016-01-14 17:04:02 -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
Nerd Lord
fed4212716 Updates guardian HUD button icons. 
Adds two new holoparasite colors, light purple and crimson.
Replaces silver in the possible holoparasite prefix list with platinum.
Updates descriptions for the guardian types traitors have access to.

Adds glow effects when guardians teleport or recall, including fire guardian teleporting and support guardian teleporting.
 2016-01-12 16:39:08 -05:00
Buggy123
692d3a6100 Fuck it just genericize the description. 2016-01-10 18:46:38 -05:00
Buggy123
18bab22f25 New spraypaint decal 2016-01-10 18:23:43 -05:00
Buggy123
ebb7e62edc Update crayon.dm 2016-01-10 02:54:22 -05:00
Buggy123
30ceab8c19 Spraypainted stuff no longer appears to be drawn with crayons. 2016-01-10 02:33:07 -05:00
Buggy123
03da055f5c Maybe now it'll compile? 2016-01-10 01:58:44 -05:00
Buggy123
2d6ba27ce8 Update mirror.dm 2016-01-10 01:38:44 -05: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
7bf3834b5e Merge pull request #14487 from xxalpha/shingles 
Floor level objects will now be protected from explosions until they are exposed.
 2016-01-09 20:30:02 -03:00
xxalpha
4dd308c278 fix 
glass windows no strong

Affect all levels if in devastating range.
 2016-01-09 23:00:24 +00:00
tkdrg
24b7eaa23a Merge pull request #14488 from KorPhaeron/wall_layer 
Walls are a slightly higher layer than floors
 2016-01-09 18:41:59 -03: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
1d9b334e50 Fixes layers 2016-01-09 15:32:35 -06: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
50bb3263bb Merge pull request #14485 from lordpidey/Mop_bucket 
Can put mop in janicart when dry
 2016-01-08 18:14:47 -03: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
duncathan salt
227b3149b2 Merge pull request #14441 from SouDescolado/master 
Fixes abandoned crates minigame / Also fixes tuberculosis kit
 2016-01-08 07:16:22 -06:00
Mike Long
33a9f7cb15 Can put mop in janicart when dry 
Fixes #5428
 2016-01-07 11:02:06 -05:00
tkdrg
83b9ed8e18 Merge pull request #14433 from bgobandit/fixuno 
Windows now give a message when repaired.
 2016-01-07 03:18:48 -03:00
duncathan salt
18b9d67ab5 Merge pull request #14364 from swankcookie/cockroach_guts_fix 
Cockroach guts fix
 2016-01-06 22:50:15 -06:00
KorPhaeron
1ce90959ef Notify 2016-01-06 22:40:50 -06:00
swankcookie
98d4b9076d Moves contraband to a more fitting location 
Signed-off-by: swankcookie <__X__>
 2016-01-06 22:12:00 -06:00
swankcookie
d4c3048a31 Removes redundant anchor tags 
Signed-off-by: swankcookie <__X__>
 2016-01-06 22:08:17 -06:00
tkdrg
5d6b18b177 Merge pull request #14446 from KorPhaeron/take_their_boxes_away 
Fixes cardboard boxes deleting people
 2016-01-06 15:52:14 -03:00
KorPhaeron
cf537737a1 Closets 2016-01-06 12:39:07 -06:00
Cheridan
1e516a68c7 Merge pull request #14347 from Iamgoofball/patch-143 
Tesla Nerf (shh dont tell aran)
 2016-01-06 12:22:05 -06:00
SouDescolado
783e669c2d Fixes Tuberculosis kit 
Name was wrong
 2016-01-06 15:52:38 -02:00
bgobandit
b1dbe47bbf Windows give a message when repaired. 2016-01-06 01:30:19 -05: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
tkdrg
c13a2f97e5 Merge pull request #14342 from neersighted/tgui_followup 
More tgui fixes and tweaks
 2016-01-04 18:39:52 -03:00
duncathan salt
9a18bf56fc Merge pull request #14341 from phil235/CremationRuntimeFix 
Fixes runtime when trying to cremate cockroach
 2016-01-04 20:23:49 +01:00