cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-13 10:23:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,531 Commits 62 Branches 14 Tags
8cbfed09a5ffd7e10b60f4e73b424eccc5a42a4d
Commit Graph

10642 Commits

Author SHA1 Message Date
Razharas
8cbfed09a5 Merge pull request #11346 from bgobandit/newsurgerytweaks 
New Ghetto Surgery Items: Non-Fucked Up Edition
 2015-09-01 10:04:25 +03:00
Razharas
cddb32f606 Merge pull request #11384 from Aranclanos/petemilking 
Fixes goat and cow milking, they were just simply not working.
 2015-09-01 10:02:27 +03:00
Razharas
3bf36ad9a6 Merge pull request #11475 from MrStonedOne/patch-33 
Changes gold slimes mob list to use initial() and only generate the mob list once.
 2015-09-01 09:54:31 +03:00
Razharas
40bdd7e1eb Merge pull request #11488 from bgobandit/smeslogging 
Adds fingerprint transfer for machine deconstruction; logs SMES
 2015-09-01 09:50:57 +03:00
Aranclanos
fac0c3ec82 Merge pull request #11510 from Aranclanos/assembly 
Assembly qdel fix
 2015-08-31 10:28:23 -03:00
Aranclanos
ec8aeb53bc Fixes tank transfer bombs clogging the MC and multiple infinite loops with assembly deletion. 2015-08-31 07:12:20 -03:00
xxalpha
3f29a9866c Merge remote-tracking branch 'upstream/master' into qdelFixes 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
 2015-08-31 08:52:30 +01:00
c0
72c6daef8b Fastfix 2015-08-31 10:16:34 +03:00
Cheridan
69fa21e66d Merge pull request #11472 from Aranclanos/larvatypo 
REMOVES ALIEN LARVAS
 2015-08-31 00:30:31 -05:00
Kyle Spier-Swenson
cfe1aba809 Cleans up gold slime moblist code. 
It will only generate the mob list once, and it won't use :  (thanks RR)
 2015-08-30 21:45:31 -07:00
Cheridan
529059c3f1 Merge pull request #11459 from bgobandit/itsafuckingpotionfuck 
Refactors slime potions.
 2015-08-30 20:34:45 -05:00
Razharas
d1c417e996 Merge pull request #11416 from xxalpha/airlockQDEL 
Added qdel(wires) to a bunch of objects Destroy proc.
 2015-08-31 00:08:27 +03:00
bgobandit
d4e058c7ea HONK HONK HONK HONK HONK 2015-08-30 15:08:54 -04:00
bgobandit
504f2b7270 Adds fingerprint transfer for machine deconstruction and logging for SMES in particular. 2015-08-30 14:58:21 -04:00
Cheridan
32d74ad19c Merge pull request #11433 from Core0verload/framed 
Buttons and wall frames rework
 2015-08-30 13:43:19 -05:00
c0
97b792bbc3 Changed some circuits paths to reduce copypasta 2015-08-30 16:58:13 +03:00
Jordie0608
4c1730a008 Merge branch 'master' of https://github.com/tgstation/-tg-station into fromanicperspectivethesqldbislikeadivinespacecensus 
Conflicts:
	code/modules/admin/topic.dm
 2015-08-30 22:55:53 +10:00
Razharas
244408b575 Merge pull request #11377 from Jordie0608/ithoughtifixedthisbutapparentlynot 
Fixes #11375, note ckey fix
 2015-08-30 15:44:14 +03:00
Razharas
87089c34ca Merge pull request #11324 from Jordie0608/technicallythisisrightsincealltextisbinarydata 
Fixes #11281 nonalpha dbnote search
 2015-08-30 15:43:20 +03:00
Razharas
b9009c43b0 Merge pull request #11319 from Jordie0608/wouldabanforinfinityminutesstillbeatempban 
Fixes #11312, Removes time limit on tempbans
 2015-08-30 15:41:58 +03:00
Kyle Spier-Swenson
53a1485bf1 Changes gold slimes mob list to use initial() 
fixes #11434

As far as I know, the use of a : is required for this trick.
 2015-08-30 01:03:09 -07:00
Jordie
f26a67348d Merge pull request #11455 from Ergovisavi/gang_hires_a_cleaner 
Some swarmer issue fixes
 2015-08-30 17:51:57 +10:00
Aranclanos
0da6bf9430 Merge branch 'master' of https://github.com/tgstation/-tg-station into petemilking 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
 2015-08-29 23:14:57 -03:00
Aranclanos
537c823fa8 Removes an incorrect type path, mob/living/carbon/larva, unused. It was just a typo. 2015-08-29 22:48:20 -03:00
Cheridan
04869ad71d Merge pull request #11451 from Aranclanos/carbonreagents 
Fixes alien larva breathing.
 2015-08-29 20:02:29 -05:00
Cheridan
7a469e240a Merge pull request #11437 from bgobandit/dronepax 
Refactors medical stacks used on simple animals.
 2015-08-29 18:55:27 -05:00
bgobandit
edf918282e Tweaks text and numbers. 2015-08-29 19:54:44 -04:00
Ergovisavi
49ce1d65db -Fixes #11448 
-Fixes #11443
Swarmer related issues
Also adds feedback to where unactivated swarmers spawn, and if someone took one before you
Fixes the automated announcement system not qdel()-ing properly
 2015-08-29 14:45:28 -07:00
Cheridan
a724415593 Merge pull request #11450 from Aranclanos/srcisnull 
some runtimes and goons r4407 haunting me again
 2015-08-29 16:21:35 -05:00
hornygranny
2367ae48c9 Revert "Smooth out gliding so movement isn't (as) jerky" 2015-08-29 13:37:55 -07:00
xxalpha
3379cb8145 Fixed cyborg modules, cyborg parts and cyborgs not qdelling properly. 2015-08-29 19:24:36 +01:00
Cheridan
a904c2a765 Merge pull request #11446 from AnturK/randomfixes 
Armor Fix, Restrained SNPC fix
 2015-08-29 13:13:49 -05:00
Swag McYolosteinen
137f0e0baf Merge pull request #11159 from MrPerson/smooth_gliding 
Smooth out gliding so movement isn't (as) jerky
 2015-08-29 17:56:40 +02:00
Cheridan
155f8f6fe7 Merge pull request #11440 from spasticVerbalizer/yesYouAreInSpace 
Prevents securing emitters and field gens in space
 2015-08-29 10:42:30 -05:00
Aranclanos
8922c974ac Merge pull request #11441 from Jordie0608/thislettersismadefromallnaturalrecycledcommas 
Makes .getruntimelog point to correct dir
 2015-08-29 11:24:59 -03:00
bgobandit
14d5cb7340 Refactors slime potions. 2015-08-29 02:42:54 -04:00
Aranclanos
3714bdf0d2 Fixes alien larva breathing. 
Moves the create_reagets() to carbon New() instead of each subtype calling it by themselves.
 2015-08-28 18:21:28 -03:00
Aranclanos
6482bf4e14 Removes the src = null lines from chemistry code, it comes from way back, goons r4407 and its really not needed anymore. 
Fixes gas reagents not triggering their reaction on some targets.
 2015-08-28 17:51:06 -03:00
AnturK
0e46800fd1 fixes snpc cuff pulling 2015-08-28 19:03:22 +02:00
Jordie0608
ec8ef21515 makes .getruntimelog point to correct dir 2015-08-28 22:20:14 +10:00
Cheridan
e11befbbfa Merge pull request #11356 from Aranclanos/listnull 
Fixes the brand intelligence event not triggering the uprising under …
 2015-08-28 07:20:03 -05:00
Maarten van den Berg
3430e8824e Prevents emitters and field gens from being wrenched to the floor in space 2015-08-28 13:33:31 +02:00
c0
4374c96117 Fixes 2015-08-28 10:44:34 +03:00
bgobandit
607170a9ef g merge conflicts. remote-tracking branch 'upstream/master' into dronepax 
Conflicts:
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	code/modules/mob/living/simple_animal/slaughter/slaughter.dm
 2015-08-28 02:54:43 -04:00
bgobandit
6f6744da33 Refactors healing simple animals with bruise packs. 2015-08-28 02:02:43 -04:00
Cheridan
d824f7b35f Merge pull request #11382 from Ergovisavi/bot_swarm 
Adds "Swarmers" - Simple mob side antagonist
 2015-08-28 00:21:23 -05:00
Ergovisavi
3737234b9c -Adds swarmer as a language, makes them only able to speak to each other 
-Fixes a few structures/machines taking non brute/burn damage from attack_animal
-Adjusts girders to be a little less resistant to explosions
-Span classes all the swarmer messages, bumps their health up to 40
-Adds ability for swarmers to dismantle machines and disable cameras. Some are obviously protected.
 2015-08-27 22:10:30 -07:00
Cheridan
7f0f74f100 Merge pull request #11380 from bgobandit/salicyclicassblastusa 
Fixes burn kits containing salicyclic acid pills. Adds new burn medication.
 2015-08-27 23:53:58 -05:00
Cheridan
d8f8f89203 Merge pull request #11386 from Aranclanos/rapiddupe 
Fixes the admin message not appearing under certain conditions when t…
 2015-08-27 23:46:57 -05:00
c0
d54d4b3054 Assembly 2015-08-28 02:02:17 +03:00