cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 19:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,497 Commits 62 Branches 14 Tags
90b3fed5dfaa1bb0f37192bf0eeea3bf830c6e45
Commit Graph

3309 Commits

Author SHA1 Message Date
Cheridan
448d0fab7f Merge pull request #5913 from tkdrg/yearslater 
Makes cyborg modules NODROP
 2014-11-21 10:17:53 -06:00
Cheridan
0da09e3f6b Merge pull request #5557 from Incoming5643/magicmania1.76 
Magic Mania 1.76: Lets outrun the feature freeze
 2014-11-20 09:07:41 -06:00
Cheridan
1208c48af3 Merge pull request #5652 from Menshin/atmos_z_level_fix 
Atmos z level fix + radio controller code sanitization
 2014-11-18 17:05:14 -06:00
Cheridan
c98448b5c2 Merge pull request #5650 from phil235/MechAtkFix1 
All mechs get a melee attack
 2014-11-18 12:53:52 -06:00
tkdrg
0f28c013ff Makes cyborg modules NODROP 2014-11-16 15:59:57 -03:00
tkdrg
e05dbe3b27 Fixes facehuger bugs 2014-11-16 03:26:27 -03:00
hornygranny
509c07650f Merge pull request #5802 from paprka/EATITFATTY 
Clothing sprite/file path changes
 2014-11-15 20:28:43 -08:00
hornygranny
ac6d5b9558 Merge pull request #5861 from tkdrg/moarfloors 
Floor refactor MkII
 2014-11-15 20:13:50 -08:00
Incoming
fbbc77f905 Merge branch 'master' of https://github.com/tgstation/-tg-station into magicmania1.76 
Conflicts:
	code/modules/projectiles/projectile/magic.dm
 2014-11-15 14:44:51 -05:00
Razharas
2ec1658be0 Merge pull request #5735 from phil235/StingMiddleClickRuntimeFIx 
Moving carbon/middleclickon() form carbon.dm to click.dm
 2014-11-15 02:51:24 +03:00
Remie Richards
2f57a8980a Merge pull request #5804 from TZK13/Preferences-Setup-Fixes-2 
Fixes the previews in the character setup screen again
 2014-11-14 18:29:17 +00:00
tkdrg
77a6df36f7 Merge remote-tracking branch 'upstream/master' into moarfloors 
Conflicts:
	_maps/map_files/MetaStation.v39K.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/machinery/bots/floorbot.dm
 2014-11-14 15:23:35 -03:00
Remie Richards
17607d0aa2 Merge pull request #5776 from MrPerson/throwing_changes 
Throwing bugfixes
 2014-11-14 18:04:00 +00:00
Menshin
ec944abfc6 * limit atmos/fire alerts to the current z_level 
* atmos/fire alerts are now linked to an object and not its area, as intended
* simplified and full pathed the radio frequency datum
* made radio objects properly clean on del/qdel, instead of letting the radio controller remove nulls at each post_signal()
 2014-11-14 10:10:45 +01:00
paprka
ec6b2424d2 purge the unused 2014-11-13 21:10:53 -08:00
Cheridan
864692abad Merge pull request #5813 from paprka/suicideviaborg 
Gives borgs appropriate module-based flashlights
 2014-11-13 19:56:15 -06:00
Cheridan
37081d444e Merge pull request #5744 from tkdrg/ihatelife 
Cleans up Life() a little bit
 2014-11-13 17:48:18 -06:00
Cheridan
38eeca2ebd Merge pull request #5644 from Jordie0608/beekeepermodewhen 
Adds bee swarms and butterflies and diseases to create them
 2014-11-13 17:04:29 -06:00
phil235
fce8781994 Merge branch 'master' of https://github.com/tgstation/-tg-station into StingMiddleClickRuntimeFIx 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
 2014-11-13 17:44:09 +01:00
phil235
a005055cf3 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechAtkFix1 
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living_defense.dm
 2014-11-13 17:17:23 +01:00
tkdrg
ed4c03b099 Floor cleanup: Repaths /turf/simulated/floor to /turf/simulated/floor/plasteel 
Repaths carpet and grass to /turf/simulated/floor/fancy/carpet and /turf/simulated/floor/fancy/grass
Cleans up a few floor procs
 2014-11-12 22:50:32 -03:00
hornygranny
ace3848ed8 Merge pull request #5801 from tkdrg/spessspeed 
Speeds up space movement a little bit
 2014-11-10 20:19:54 -08:00
paprka
057482c64b gives borgs appropriate module-based flashlights 2014-11-10 10:54:35 -08:00
Swag McYolosteinen
7ce90ff54a Merge pull request #5654 from GunHog/Potato_AI_Wants_To_Hear_You_Scream_Too 
Gives Traitor AIs the Syndicate Channel!
 2014-11-10 17:18:04 +01:00
hornygranny
1cbfe107b5 Merge pull request #5751 from Miauw62/blugh 
Fixes border window phasing.
 2014-11-10 08:15:46 -08:00
Swag McYolosteinen
9893fbc86f Merge pull request #5645 from Ergovisavi/firefighting 
Firefighting changes
 2014-11-10 16:55:38 +01:00
Cheridan
5514f6f644 Merge pull request #5765 from tkdrg/reactconstruct 
Adds check_shields() to attack_animal and friends
 2014-11-09 21:19:21 -06:00
TZK13
109076dc63 Updates labcoats in the preferences setup screen to appear closed and changes the lawyer's shoes to be lace ups instead of brown. 2014-11-09 19:30:33 -06:00
Ergovisavi
481a282ca8 Adds NODROP to the Atmos watertank nozzle. I have no regrets. 2014-11-09 13:56:12 -08:00
tkdrg
170e9573fa Speeds up space movement a little bit. 2014-11-09 17:37:01 -03:00
Ergovisavi
2c74fc8dbb -Adds secure atmos closets to Atmos 
-Removes a redundant check in water's obj reaction, add's a "cooling power" var that determines how effective it is at cooling off hotspots
-Modifies extinguishers a bit to have more options, affect more tiles, change the cooling temperature of the water inside of it, etc
-Makes the water backpack for atmos even more robust at fighting fires with a 5 tile spread, removes converting oxygen to nitrogen on Nanofrost, made the resulting end of a firefight annoying as the atmos tech would have to get an oxygen canister
-Makes racks use Move() to put objects on top of them instead of just changing the loc, in order to stop nozzles/misters from getting on them
 2014-11-09 11:16:58 -08:00
GunHog
4bc6ded418 Merge remote-tracking branch 'remotes/upstream/master' into Potato_AI_Wants_To_Hear_You_Scream_Too 
Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm
 2014-11-09 12:27:48 -06:00
MrPerson
c159878ace Throwing bugfixes 
Removed an unused client verb, changed a usr to src where they're the same mob, and changed a type == check to istype().

Allow turning on throw mode when clicking the UI button (hotkeys already allow you to do this).
Disallow throwing when not on a turf.
Fixes #4823

Make storage items close out the onscreen stuff when they get thrown.
Fixes #5296
 2014-11-09 00:29:20 -08:00
Jordie0608
1a59c578b9 Fixes path error 2014-11-09 16:54:13 +11:00
hornygranny
9eb231be23 Merge pull request #5734 from paprka/removeborgnvg 
Fixes borg mesons giving them pseudo night vision
 2014-11-08 15:21:23 -08:00
hornygranny
71efbeef26 Merge pull request #5213 from Miauw62/whatthefuckareyouevensupposedtocallthesebranchesffs 
Fixes whisper formatting hopefully maybe.
 2014-11-08 15:12:59 -08:00
hornygranny
28592a230e Merge pull request #5737 from phil235/GrabbyPunchyFix 
Adding a NOBLUDGEON check to simple_animal/attackby()
 2014-11-08 15:07:18 -08:00
tkdrg
a394832f96 Adds check_shields() to attack_animal and friends 2014-11-08 19:16:54 -03:00
Jordie0608
590684e129 Merge branch 'master' of https://github.com/tgstation/-tg-station into beekeepermodewhen 
Conflicts:
	icons/mob/animal.dmi
	tgstation.dme
 2014-11-09 00:15:12 +11:00
Miauw
c275a9394d Fixes being able to phase through windows using grabs. Fixed #3957 
Fixes the supply shuttle safety applying when it is at centcomm. Fixed #3808
 2014-11-08 13:21:55 +01:00
Ergovisavi
9c1366d65f Adds a new define for temperature protection for more robust firefighting gear 
Adds Atmos Firesuits, Atmos Firesuit Helmets, sprites for all the firefighting gear etc
 2014-11-08 02:14:37 -08:00
Cheridan
53bf024dbe Merge pull request #5545 from RemieRichards/DiseaseRework 
Disease Code Partial Rework
 2014-11-08 00:17:47 -06:00
Cheridan
a9d1963eb6 Merge pull request #5723 from Aranclanos/hideclown 
Hiding the jumpsuit with HIDEJUMPSUIT exosuits
 2014-11-07 23:58:33 -06:00
Cheridan
e49e4efe29 Merge pull request #5704 from phil235/TypoFix1 
Fixes the ability to beat up a pAI.
 2014-11-07 23:52:31 -06:00
Cheridan
9721c6fb6f Merge pull request #5724 from Aranclanos/suicidestuff 
Reworked a bit the suicide verb
 2014-11-07 23:47:15 -06:00
tkdrg
61adfa8543 Somewhat cleaned up alien/Life() and carbon life a little bit 2014-11-08 01:12:33 -03:00
hornygranny
efb3877fcf Merge pull request #5682 from paprka/fixdefib 
Defibrillator Hotfixes
 2014-11-07 19:49:04 -08:00
Remie Richards
e84beec0e2 more conflict fixes. 2014-11-08 01:22:27 +00:00
Remie Richards
2054cbda08 Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human_attackpaw.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
 2014-11-08 01:07:29 +00:00
Cheridan
7974b77dfa Merge pull request #5703 from phil235/AttackHandFix 
Less copypasta in mob attack procs
 2014-11-07 18:06:45 -06:00