cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-22 06:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,875 Commits 61 Branches 14 Tags
2d26c7e2bd9750be3b2bcbe9dac13eca65b5a87d
Commit Graph

7358 Commits

Author SHA1 Message Date
carnie
2d26c7e2bd Resolves #6927 - Many Stat() procs did not have if(statpanel("panelname")) checks. 2015-01-11 17:01:41 +00:00
tkdrg
86c25410f5 Merge pull request #6926 from Carn/#6890 
Resolves #6890
 2015-01-10 21:51:27 -03:00
tkdrg
3f802d1ae4 Merge pull request #6917 from Nienhaus/FoxV2 
Fox 2.0
 2015-01-10 20:38:58 -03:00
tkdrg
491ac50376 Merge pull request #6918 from Menshin/mimic_nullspace_fix 
Fixes mimic spawning in nullspace
 2015-01-10 20:21:36 -03:00
tkdrg
0f19537c2d Merge pull request #6721 from phil235/CargoCrateNameFix 
Many typo fixes
 2015-01-10 20:11:13 -03:00
tkdrg
b0635993a4 Revert "[FEATURE] Emergency Response Team" 2015-01-10 19:55:30 -03:00
tkdrg
1756bfc3f0 Merge pull request #6913 from paprka/secborg 
Hybrid taser / Cyborg taser hotfix
 2015-01-10 17:59:27 -03:00
Swag McYolosteinen
5117f15f54 Merge pull request #6909 from dannno/AIsprites 
Lots of AI core sprites
 2015-01-10 20:11:17 +01: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
carnie
6643519866 Resolves #6890 - Uses ETA for centcom->station, ETD for station, ESC for station->centcom, RCL for station->centcom(recall) 2015-01-10 01:11:49 +00:00
Menshin
82adbfde9e Fixes mimic spawning in nullspace if the overridden machinery was qdel'ed. 2015-01-10 00:06:53 +01:00
Nienhaus
4d34f2235e Fox 2.0 
https://github.com/tgstation/-tg-station/pull/6489/
 2015-01-09 16:41:37 -06: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
dannno
1a761488fa fun removed hitler wins 2015-01-09 13:23:08 -05:00
paprka
b201c9211e advanced / cyborg taser hotfix 2015-01-09 09:51:03 -08:00
dannno
41f32bf3b6 adds E-102 AI sprite, made by myself, at Vekter's request 2015-01-09 00:54:17 -05:00
dannno
fdac62afe0 Lots of AI core sprites 2015-01-09 00:13:24 -05: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