cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 04:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,841 Commits 61 Branches 14 Tags
204fdb8b2fcd3872d1fd2e2002105caa12f8dcda
Commit Graph

7344 Commits

Author SHA1 Message Date
Firecage
204fdb8b2f Update to biogenerator stuff PR 2015-01-16 09:24:39 +02:00
Firecage
c1368f6816 Fixes what Miauw said with the secbelt thing. 2015-01-11 21:31:21 +02:00
Firecage
2e20b8ea91 Biogenerator stuff. 2015-01-11 16:53:41 +02:00
Swag McYolosteinen
404cd883f7 Merge pull request #6705 from Steelpoint/EmergencyResponseTeam 
[FEATURE] Emergency Response Team
 2015-01-10 10:10:59 +01:00
tkdrg
179003b57c Merge pull request #6808 from Boggart/readminbugfix 
Re-admin bugfixes.
 2015-01-10 01:29:01 -03:00
tkdrg
1f91ac52a3 Merge pull request #6894 from Miauw62/ayythelmaoening 
Emagged borgs will now properly unreference their MMI.
 2015-01-10 01:16:01 -03:00
tkdrg
e79f4fc0c8 Merge pull request #6889 from Jordie0608/breakingtherelativebottle 
Refactors glass bottle reagent spawning
 2015-01-10 01:09:48 -03:00
tkdrg
4291df8918 Merge pull request #6887 from Incoming5643/MyLittleSlimeCannotBeThisCute 
Allows player slimes to use the slime faces that npc slimes can uses
 2015-01-09 18:00:47 -03:00
Steelpoint
ccdf83b8af QuickTidyUp 2015-01-09 11:28:55 +08:00
Steelpoint
34589f52bf Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 
Conflicts:
	code/modules/projectiles/guns/energy/nuclear.dm
	icons/obj/gun.dmi
 2015-01-09 11:02:50 +08:00
hornygranny
56bad0f7ce Merge pull request #6747 from paprka/gunchangesv2baby 
Further changes to the ranged stun system
 2015-01-08 16:09:37 -08:00
Incoming
819add5c0c *merges the slime face emotes into the generic emote list so there's no new VERB 
*makes a changelog so no one misses out on this important news
 2015-01-08 17:12:14 -05:00
Miauw
731a9c03e5 >greentext commit messages 2015-01-08 20:42:05 +01:00
tkdrg
567755d798 Merge pull request #6836 from Boggart/holosignfix 
Fixes the holosign projector making signs when put into storage. (can_be_placed_into refactor)
 2015-01-08 16:04:49 -03:00
Miauw
851f3e09b3 when i say copypasted, i mean it. 2015-01-08 20:00:47 +01:00
Miauw
ab6d6a9b70 Prevents this bug from turning into a hydra. 2015-01-08 19:56:44 +01:00
Miauw
109b0a434a Fixed #3251, emagged borgs will now properly unreference their MMI. 2015-01-08 19:49:48 +01:00
Steelpoint
d7b56c9d7e Nanites! 2015-01-08 20:13:06 +08:00
Jordie0608
c6bd18c0f7 Refactors glass bottle reagent spawning, removes vestigial vars, bottles and robot bottles 2015-01-08 22:12:01 +11:00
Incoming
27857ae90d Allows player slimes to use the slime faces that npc slimes can uses. 
Fixes #6882

Priority: Critical
 2015-01-08 04:47:35 -05:00
Cheridan
e4f42a2aef Merge pull request #6750 from phil235/VisibleMessageFixing 
Fixes visible_messages.
 2015-01-07 20:06:21 -06:00
tkdrg
a2ea238b0c Merge pull request #6639 from paprka/posfixes 
Fixes some window sizes
 2015-01-07 21:07:43 -03:00
Cheridan
87af9dcac4 fixes conflict 
adds caching for ultimum optimizmisms
 2015-01-07 17:06:39 -06:00
tkdrg
a7669b0270 Merge pull request #6816 from joonoro/master 
Fixes syringe bug from #6372
 2015-01-07 19:23:13 -03:00
paprka
2ba0cbbc7a Merge branch 'master' of https://github.com/tgstation/-tg-station into posfixes 
Conflicts:
	code/modules/mob/dead/observer/observer.dm
 2015-01-07 14:15:02 -08:00
Steelpoint
b0fe1d9818 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2015-01-08 02:09:02 +08:00
Swag McYolosteinen
4df0c62695 Merge pull request #6865 from paprka/revert-5646-newhosjumpsuit 
Revert "Adds Nien's HoS formal sprites so they dont look like a Prince s...
 2015-01-07 18:36:46 +01:00
Ergovisavi
e326cbab26 Merge pull request #6797 from sawu-tg/freshfood 
Adds the new "E.X.P.E.R.I-MENTOR" research machine.
 2015-01-07 09:31:31 -08:00
tkdrg
247f60c290 Merge pull request #6866 from Carn/fix_6864 
Resolves #6864 - Sets ticker can_fire=1 inside the start_now verb.
 2015-01-07 14:28:48 -03:00
Sawu
75335fcd08 Fixes missing Category 2015-01-08 04:21:17 +11:00
carnie
4bcc5ec791 Resolves #6864 - Sets ticker can_fire=1 inside the start_now verb. 2015-01-07 17:13:23 +00:00
paprka
88e124e88c Revert "Adds Nien's HoS formal sprites so they dont look like a Prince suit." 2015-01-07 09:12:39 -08:00
Steelpoint
699439cc31 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2015-01-08 01:12:29 +08:00
Sawu
feb141ca15 Merge branch 'master' of https://github.com/tgstation/-tg-station into freshfood 
Conflicts:
	code/modules/research/designs/machine_designs.dm
 2015-01-08 03:58:31 +11:00
Miauw
2a71a8ee12 Merge branch 'master' of https://github.com/tgstation/-tg-station into newhosjumpsuit 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/modules/clothing/under/jobs/security.dm
	code/modules/clothing/under/miscellaneous.dm
	code/modules/clothing/under/ties.dm
	icons/mob/head.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/uniforms.dmi
 2015-01-07 14:59:24 +01:00
joonoro
25e434e9a1 improved syringe fix readability 2015-01-07 12:49:54 +02:00
Boggart
e0a968f151 Fixes the holosign projector making signs when put into storage, generalizes can_be_placed_into and improves the check in objects that use it. 2015-01-07 01:09:58 -07:00
Steelpoint
e1af9924ca Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 2015-01-07 12:10:11 +08:00
tkdrg
652c8f5741 Merge pull request #6818 from Ergovisavi/more_pod_cloning 
Some replica pod cloning fixes
 2015-01-06 22:53:41 -03:00
Swag McYolosteinen
714cc8c59e Merge pull request #6780 from tkdrg/wooh 
Adds a (follow) link to ghost messages
 2015-01-06 20:58:56 +01:00
tkdrg
67c9b5be21 Changes (Follow) to (F) in the ghost chat 2015-01-06 16:28:24 -03:00
Sawu
01dedd5ea2 Merge branch 'freshfood' of https://github.com/sawu-tg/-tg-station into freshfood 2015-01-07 04:39:30 +11:00
Sawu
fba1ccd697 Quickfixes 
*Fixes missing recipe for experimentor
*Fixes the experimentor having the wrong board inside it.
 2015-01-07 04:38:49 +11:00
Steelpoint
5f77b95b23 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 2015-01-07 01:38:38 +08:00
Sawu
ada8b7f23f Fixes a rogue : 
Makes him . instead.
 2015-01-07 04:25:16 +11:00
Sawu
ad4204e43f Fixed Grammar error 
sawu-tg has fixed the error!.
 2015-01-07 04:04:59 +11:00
Sawu
ccce11fa6e Nerfed the Gas reaction majorly. 
*Now uses beepskysmash instead of pacid.
 2015-01-07 03:30:54 +11:00
Sawu
906ab53921 Quickfix to conform with the rewrite. 2015-01-07 01:51:39 +11:00
Sawu
8fcd55bd4d Merge branch 'master' of https://github.com/tgstation/-tg-station into interactive 2015-01-07 01:43:44 +11:00
Remie Richards
f918815bea Merge pull request #6741 from tkdrg/atmoslog 
Adds atmos investigate_log
 2015-01-06 07:56:17 +00:00