cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-21 06:25:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
131b69474e2117c50f31cf07e01bd988676e6786
Bubberstation/code/modules
History
Remie Richards 131b69474e Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence 
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/modules/client/preferences.dm
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
2015-09-27 17:15:01 +01:00
..
admin
Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
2015-09-27 17:15:01 +01:00
assembly
Merge remote-tracking branch 'upstream/master' into hot_or_not
2015-09-24 03:14:04 +01:00
awaymissions
Merge pull request #11883 from phil235/DnaMonkeyStuff
2015-09-22 18:43:27 +03:00
client
Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
2015-09-27 17:15:01 +01:00
clothing
Merge remote-tracking branch 'upstream/master' into hot_or_not
2015-09-24 03:14:04 +01:00
crafting
…
detectivework
Merge branch 'master' of https://github.com/tgstation/-tg-station into DnaMonkeyStuff
2015-09-19 22:34:30 +02:00
emoji
…
events
Some minor fixes to firecages pr
2015-09-25 17:12:15 +03:00
flufftext
…
food&drinks
Merge branch 'edgy' into hot_or_not
2015-09-24 03:12:08 +01:00
games
…
holiday
…
html_interface
…
hydroponics
Replaced /proc/is_sharp() with /obj/item/proc/is_sharp().
2015-09-24 03:08:28 +01:00
library
removes a bunch of .0
2015-09-10 20:57:30 +09:00
lighting
…
mining
Replaced /proc/is_sharp() with /obj/item/proc/is_sharp().
2015-09-24 03:08:28 +01:00
mob
Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
2015-09-27 17:15:01 +01:00
nano
…
ninja
- Fixed monkey starting with no dna.
2015-09-19 22:18:28 +02:00
paperwork
Replaced refactored is_hot() to be an atom proc.
2015-09-24 01:12:38 +01:00
power
Merge remote-tracking branch 'upstream/master' into hot_or_not
2015-09-24 03:14:04 +01:00
procedural mapping
…
projectiles
Merge remote-tracking branch 'upstream/master' into hot_or_not
2015-09-24 03:14:04 +01:00
reagents
Organs update 3
2015-09-25 22:26:15 +03:00
recycling
Merge pull request #11899 from kingofkosmos/altclickrotatepipe
2015-09-24 01:59:04 +03:00
research
Merge pull request #11925 from Core0verload/matter-final
2015-09-23 21:11:17 +03:00
scripting
…
security levels
removes a bunch of .0
2015-09-10 20:57:30 +09:00
shuttle
…
space transition
Use defines instead of magic
2015-09-08 21:58:05 +03:00
surgery
Organs update 3
2015-09-25 22:26:15 +03:00
telesci
removes a bunch of .0
2015-09-10 20:57:30 +09:00