cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-15 03:27:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
24dcf08b2e90e0ca4e539d331359c273354e2c12
Bubberstation/code/modules
History
MrPerson 24dcf08b2e Merge branch 'master' of https://github.com/tgstation/-tg-station into alert_alert_ur_a_faget 
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	icons/mob/screen_alien.dmi
2015-03-02 12:04:38 -08:00
..
admin
Merge pull request #7726 from xxalpha/traymesons
2015-03-02 19:24:06 +01:00
assembly
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
awaymissions
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
client
Merge pull request #7985 from Jordie0608/tgstationisaparadiseforlumberjacks
2015-03-01 13:20:33 +03:00
clothing
Merge pull request #7726 from xxalpha/traymesons
2015-03-02 19:24:06 +01:00
crafting
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
detectivework
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
emoji
…
events
Merge branch 'master' of https://github.com/tgstation/-tg-station into FUCKGIT
2015-02-25 15:17:14 +03:00
flufftext
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
food&drinks
Merge pull request #7987 from phil235/SugarSatietyRemoval
2015-03-02 18:17:40 +01:00
holiday
…
hydroponics
Merge pull request #8027 from Iamgoofball/patch-36
2015-02-28 07:00:27 +03:00
library
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
mining
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
2015-02-24 22:16:53 +00:00
mob
Merge branch 'master' of https://github.com/tgstation/-tg-station into alert_alert_ur_a_faget
2015-03-02 12:04:38 -08:00
nano
Auto load required nanoui files on client login
2015-02-25 12:25:21 +13:00
paperwork
fixes warning on compile
2015-02-25 16:28:21 +11:00
power
Removed duplicate code.
2015-03-02 17:24:40 +00:00
projectiles
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
2015-02-25 14:10:54 +08:00
reagents
Merge pull request #7987 from phil235/SugarSatietyRemoval
2015-03-02 18:17:40 +01:00
recycling
Merge pull request #7897 from paprka/riiiip
2015-02-24 21:47:52 -06:00
research
Merge pull request #7726 from xxalpha/traymesons
2015-03-02 19:24:06 +01:00
scripting
…
security levels
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00
shuttle
…
surgery
Merge branch 'master' of https://github.com/tgstation/-tg-station into ExplosionsAndEmbedding
2015-02-19 18:16:33 +00:00
telesci
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
2015-02-19 13:02:43 +00:00